fix(deps): update all dependencies

Signed-off-by: kjuulh <contact@kjuulh.io>

CHANGELOG.md

@@ -6,6 +6,87 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.0] - 2024-11-29
+
+### Added
+- feat/add-postgres-database (#20)
+
+feat: add postgres database
+
+Signed-off-by: kjuulh <contact@kjuulh.io>
+
+feat: add postgres and more templates
+
+Signed-off-by: kjuulh <contact@kjuulh.io>
+
+Reviewed-on: https://git.front.kjuulh.io/kjuulh/cuddle-clusters/pulls/20
+Co-authored-by: kjuulh <contact@kjuulh.io>
+Co-committed-by: kjuulh <contact@kjuulh.io>
+
+- add support for raw reading of variables
+- add replicas
+- set interval down to a minute
+- with native roots
+- with explicit install
+- with install
+- with ring
+- enable stuff
+- update packages
+- update packages
+- add actual grpc service
+- fix typo
+- revert to actual label
+- fix scheme
+- trying with h2c service
+- add grpc ports as well
+- fix name
+- rename
+- remove suffix
+- add ingress
+- add ingress wip
+- use lower case
+- use actual service name
+- cannot use lowe case
+- update filename
+- add namespace
+- update env
+- add crdb
+- add webroots
+- with tls
+- use new tokio stream
+- update client
+- more debugging
+- update
+- update flux releaser
+- actually set registry
+- add option for releaser
+- add slot for upload strategy
+- add user variables to input
+- without remove all
+- plan -> base
+- add sync
+- add send
+- use arc instead
+
+### Fixed
+- *(deps)* update rust crate serde to v1.0.215
+- *(deps)* update rust crate futures to v0.3.31
+- *(deps)* update rust crate minijinja to v2.3.1
+- *(deps)* update rust crate minijinja to v2.3.0
+- *(deps)* update rust crate serde to v1.0.203
+- only create vault secret template if actual secret found
+
+### Other
+- *(deps)* update rust crate tracing to v0.1.41
+- *(deps)* update all dependencies
+- *(deps)* update rust crate clap to v4.5.20
+- *(deps)* update rust crate clap to v4.5.19
+- *(deps)* update rust crate clap to v4.5.18
+- *(deps)* update rust crate anyhow to v1.0.89
+- *(deps)* update rust crate anyhow to v1.0.88
+- *(deps)* update all dependencies
+- move crdb to own file
+
 ## [0.1.1] - 2024-05-25
 
 ### Other

Cargo.toml

@@ -14,4 +14,4 @@ dotenv = { version = "0.15" }
 flux-releaser = { git = "https://git.front.kjuulh.io/kjuulh/flux-releaser", branch = "main" }
 
 [workspace.package]
-version = "0.1.1"
+version = "0.2.0"

crates/cuddle-clusters/src/catalog.rs

@@ -2,4 +2,5 @@ pub mod cluster_vars;
 pub mod crdb_database;
 pub mod cuddle_vars;
 pub mod ingress;
+pub mod postgres_database;
 pub mod vault_secret;

crates/cuddle-clusters/src/catalog/cluster_vars.rs

@@ -81,10 +81,6 @@ impl Component for ClusterVars {
                 }
             }
         }
-        // vars.raw = match value.clone().try_into() {
-        //     Ok(o) => o,
-        //     Err(e) => panic!("{}", e),
-        // };
         vars.raw = value.into();
 
         vars.name = environment.into();

crates/cuddle-clusters/src/catalog/postgres_database.rs

@@ -0,0 +1,146 @@
+use std::path::Path;
+
+use minijinja::{value::Object, Value};
+
+use crate::Component;
+
+use super::cuddle_vars::{load_cuddle_file, CuddleVariable, CuddleVariables};
+
+pub struct PostgresDatabase {
+    variables: CuddleVariables,
+}
+
+impl PostgresDatabase {
+    pub async fn new(path: &Path) -> anyhow::Result<Self> {
+        let variables = load_cuddle_file(path).await?;
+
+        Ok(Self { variables })
+    }
+}
+
+impl Component for PostgresDatabase {
+    fn name(&self) -> String {
+        "cuddle/postgres".into()
+    }
+
+    fn render_value(
+        &self,
+        environment: &str,
+        _value: &serde_yaml::Value,
+    ) -> Option<anyhow::Result<minijinja::Value>> {
+        if let Some(true) = self
+            .variables
+            .0
+            .get("database")
+            .and_then(|v| match v {
+                CuddleVariable::Object(o) => Some(o),
+                _ => None,
+            })
+            .and_then(|o| o.0.get("postgres"))
+            .and_then(|o| match o {
+                CuddleVariable::String(o) => {
+                    if o == "true" {
+                        Some(true)
+                    } else {
+                        None
+                    }
+                }
+                _ => None,
+            })
+        {
+            return Some(Ok(minijinja::Value::from_object(PostgresDatabaseValues {
+                name: self.name(),
+                enabled: true,
+            })));
+        }
+
+        Some(Ok(minijinja::Value::from_object(PostgresDatabaseValues {
+            name: self.name(),
+            enabled: false,
+        })))
+    }
+
+    fn render(
+        &self,
+        environment: &str,
+        _value: &serde_yaml::Value,
+    ) -> Option<anyhow::Result<(String, String)>> {
+        if let Some(true) = self
+            .variables
+            .0
+            .get("database")
+            .and_then(|v| match v {
+                CuddleVariable::Object(o) => Some(o),
+                _ => None,
+            })
+            .and_then(|o| o.0.get("postgres"))
+            .and_then(|o| match o {
+                CuddleVariable::String(o) => {
+                    if o == "true" {
+                        Some(true)
+                    } else {
+                        None
+                    }
+                }
+                _ => None,
+            })
+        {
+            return Some(Ok((
+                format!("{}.yaml", self.name().replace("/", "-")),
+                r#"
+{%- if environment == "dev" %}
+{%- set port = 5433 %}
+{%- else %}
+{%- set port = 5432 %}
+{%- endif %}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ vars.cuddle_postgres.file_name(vars.cuddle_vars.service) }}
+  namespace:  {{ vars.cluster_vars.namespace }}
+data:
+  DATABASE_TYPE: postgresql
+  DATABASE_HOST: {{ environment }}.postgresql.kjuulh.app
+  DATABASE_PORT: "{{ port }}"
+  DATABASE_USER: {{ vars.cuddle_vars.service | replace("-", "_") }}
+  DATABASE_DB: {{ vars.cuddle_vars.service | replace("-", "_") }}
+
+"#
+                .into(),
+            )));
+        }
+
+        None
+    }
+}
+
+#[derive(Debug)]
+struct PostgresDatabaseValues {
+    name: String,
+    enabled: bool,
+}
+
+impl Object for PostgresDatabaseValues {
+    fn get_value(self: &std::sync::Arc<Self>, key: &minijinja::Value) -> Option<minijinja::Value> {
+        let name = self.name.clone();
+        match key.as_str()? {
+            "has_values" => {
+                if self.enabled {
+                    Some(minijinja::Value::from_serialize(true))
+                } else {
+                    Some(minijinja::Value::from_serialize(false))
+                }
+            }
+            "file_name" => Some(Value::from_function(move |file_name: String| {
+                format!("{}-{}", file_name, name.replace("/", "-"))
+            })),
+            "env" => Some(Value::from_serialize(vec![
+                "DATABASE_HOST",
+                "DATABASE_PORT",
+                "DATABASE_USER",
+                "DATABASE_DB",
+            ])),
+            _ => None,
+        }
+    }
+}

crates/cuddle-clusters/src/process.rs

@@ -354,6 +354,12 @@ async fn process_render_template(
         vars => variables
     })?;
 
+    let rendered = if rendered.is_empty() || rendered.ends_with("\n") {
+        rendered
+    } else {
+        format!("{rendered}\n")
+    };
+
     dest_file.write_all(rendered.as_bytes()).await?;
 
     Ok(())

crates/cuddle-clusters/tests/can_run_for_env/expected/dev/test.yaml

@@ -3,4 +3,4 @@
   some = {
     thing = "some"
   }
-}
+}

crates/cuddle-clusters/tests/environment/expected/dev/some.yaml

@@ -1 +1 @@
-env: dev
+env: dev

crates/cuddle-clusters/tests/environment/expected/prod/some.yaml

@@ -1 +1 @@
-env: prod
+env: prod

crates/cuddle-clusters/tests/jinja/expected/dev/some.yaml

@@ -1 +1 @@
-some_file: 4
+some_file: 4

crates/cuddle-clusters/tests/nested/expected/dev/service-template

@@ -1 +1 @@
-service
+service

crates/cuddle-clusters/tests/nested/expected/dev/some-other.yaml

@@ -1 +1 @@
-service
+service

crates/cuddle-clusters/tests/nested/expected/dev/some.yaml

@@ -1 +1 @@
-service
+service

crates/cuddle-clusters/tests/tests.rs

@@ -6,7 +6,7 @@ mod cuddle_vars;
 use cuddle_clusters::{
     catalog::{
         cluster_vars::ClusterVars, crdb_database::CockroachDB, cuddle_vars::CuddleVars,
-        ingress::Ingress, vault_secret::VaultSecret,
+        ingress::Ingress, postgres_database::PostgresDatabase, vault_secret::VaultSecret,
     },
     IntoComponent,
 };
@@ -125,3 +125,21 @@ async fn with_ingress() -> anyhow::Result<()> {
 
     Ok(())
 }
+
+#[tokio::test]
+async fn with_postgres_databse() -> anyhow::Result<()> {
+    let current_dir = std::env::current_dir()?.join("tests/with_postgres_database");
+
+    run_test_with_components(
+        "with_postgres_database",
+        vec![
+            CuddleVars::new(&current_dir).await?.into_component(),
+            ClusterVars::default().into_component(),
+            VaultSecret::default().into_component(),
+            PostgresDatabase::new(&current_dir).await?.into_component(),
+        ],
+    )
+    .await?;
+
+    Ok(())
+}

crates/cuddle-clusters/tests/with_crdb/expected/dev/cuddle-crdb.yaml

@@ -6,4 +6,4 @@ metadata:
   namespace:  dev
 data:
   DATABASE_URL: postgresql://root@dev-cluster:26257/service
-                        
+                        

crates/cuddle-clusters/tests/with_crdb/expected/dev/some.yaml

@@ -36,4 +36,4 @@ spec:
         - containerPort: 3001
           name: internal-http
         - containerPort: 3002
-          name: internal-grpc
+          name: internal-grpc

crates/cuddle-clusters/tests/with_ingress/expected/dev/ingress.yaml

@@ -118,4 +118,4 @@ spec:
   tls:
   - hosts:
     - grpc.service.dev.internal.kjuulh.app
-    secretName: tls-service-kjuulh-app-internal-grpc-ingress-dns
+    secretName: tls-service-kjuulh-app-internal-grpc-ingress-dns

crates/cuddle-clusters/tests/with_ingress/expected/dev/some.yaml

@@ -27,4 +27,4 @@ spec:
         - containerPort: 3001
           name: internal-http
         - containerPort: 3002
-          name: internal-grpc
+          name: internal-grpc

crates/cuddle-clusters/tests/with_ingress/expected/prod/ingress.yaml

@@ -118,4 +118,4 @@ spec:
   tls:
   - hosts:
     - grpc.service.prod.internal.kjuulh.app
-    secretName: tls-service-kjuulh-app-internal-grpc-ingress-dns
+    secretName: tls-service-kjuulh-app-internal-grpc-ingress-dns

crates/cuddle-clusters/tests/with_ingress/expected/prod/some.yaml

@@ -27,4 +27,4 @@ spec:
         - containerPort: 3001
           name: internal-http
         - containerPort: 3002
-          name: internal-grpc
+          name: internal-grpc

crates/cuddle-clusters/tests/with_postgres_database/cuddle.yaml

@@ -0,0 +1,7 @@
+vars:
+  service: service
+  database:
+    postgres: "true"
+
+cuddle/clusters:
+  dev:

crates/cuddle-clusters/tests/with_postgres_database/expected/dev/cuddle-postgres.yaml

@@ -0,0 +1,12 @@
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: service-cuddle-postgres
+  namespace:  dev
+data:
+  DATABASE_TYPE: postgresql
+  DATABASE_HOST: dev.postgresql.kjuulh.app
+  DATABASE_PORT: "5433"
+  DATABASE_USER: service
+  DATABASE_DB: service

crates/cuddle-clusters/tests/with_postgres_database/expected/dev/some.yaml

@@ -0,0 +1,54 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: service
+  name: service
+spec:
+  replicas: 3
+  selector:
+    matchLabels:
+      app: service
+  template:
+    metadata:
+      labels:
+        app: service
+    spec:
+      containers:
+      - args:
+        - serve
+        command:
+        - service
+        image: kasperhermansen/service:main-1715336504
+        name: service
+        envFrom:
+        - configMapRef:
+            name: service-config
+        env:
+        - name: DATABASE_HOST
+          valueFrom:
+            secretKeyRef:
+              name: service-cuddle-postgres
+              key: DATABASE_HOST
+        - name: DATABASE_PORT
+          valueFrom:
+            secretKeyRef:
+              name: service-cuddle-postgres
+              key: DATABASE_PORT
+        - name: DATABASE_USER
+          valueFrom:
+            secretKeyRef:
+              name: service-cuddle-postgres
+              key: DATABASE_USER
+        - name: DATABASE_DB
+          valueFrom:
+            secretKeyRef:
+              name: service-cuddle-postgres
+              key: DATABASE_DB
+        ports:
+        - containerPort: 3000
+          name: external-http
+        - containerPort: 3001
+          name: internal-http
+        - containerPort: 3002
+          name: internal-grpc

crates/cuddle-clusters/tests/with_postgres_database/templates/clusters/some.yaml.jinja2

@@ -0,0 +1,56 @@
+{%- set service_name = vars.cuddle_vars.service -%}
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: {{ service_name }}
+  name: {{ service_name }}
+spec:
+  replicas: 3
+  selector:
+    matchLabels:
+      app: {{ service_name }}
+  template:
+    metadata:
+      labels:
+        app: {{ service_name }}
+    spec:
+      containers:
+      - args:
+        - serve
+        command:
+        - {{ service_name }}
+        image: kasperhermansen/{{ service_name }}:main-1715336504
+        name: {{ service_name }}
+        envFrom:
+        - configMapRef:
+            name: {{service_name}}-config
+        {%- if vars.vault_secret.has_values or vars.cuddle_postgres.has_values %}
+        env:
+        {%- if vars.vault_secret.has_values  %}
+        {%- for secret in vars.vault_secret.secrets %}
+        - name: {{secret  | upper | replace(".", "_") | replace("-", "_") }}
+          valueFrom:
+            secretKeyRef:
+              name: {{ vars.vault_secret.file_name(service_name) }}
+              key: {{ secret }}
+        {%- endfor %}
+        {%- endif %}
+        {%- if vars.cuddle_postgres.has_values %}
+        {%- for env in vars.cuddle_postgres.env %}
+        - name: {{ env }}
+          valueFrom:
+            secretKeyRef:
+              name: {{ vars.cuddle_postgres.file_name(service_name) }}
+              key: {{ env }}
+        {%- endfor %}
+        {%- endif %}
+        {%- endif %}
+        ports:
+        - containerPort: 3000
+          name: external-http
+        - containerPort: 3001
+          name: internal-http
+        - containerPort: 3002
+          name: internal-grpc

crates/cuddle-clusters/tests/with_vault_secrets/expected/dev/some.yaml

@@ -36,4 +36,4 @@ spec:
         - containerPort: 3001
           name: internal-http
         - containerPort: 3002
-          name: internal-grpc
+          name: internal-grpc

crates/cuddle-clusters/tests/with_vault_secrets/expected/dev/vault_secret.yaml

@@ -10,4 +10,4 @@ spec:
   mount: kvv2
   path: service/dev
   refreshAfter: 30s
-  type: kv-v2
+  type: kv-v2