Stacks in group vars #2

.dx/ansible.cfg

@@ -4,3 +4,4 @@ inventory = inventory
 any_errors_fatal = true
 display_skipped_hosts = false
 unparsed_is_failed = true
+callback_result_format = yaml

.dx/binaries.yaml

@@ -7,12 +7,12 @@
       ansible.builtin.command:
         cmd: git hash-object --stdin
         stdin: |
-          {{ lib_cid }}
-          {{ solution.apps[app].cid }}
+          {{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=libs')[:7] }}
+          {{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=apps/' ~ app)[:7] }}
       # TODO: try to choose better name
       register: image_cid
       changed_when: false
-      loop: "{{ solution.apps.keys() }}"
+      loop: "{{ solution.apps.values()|flatten|map(attribute='binary') }}"
       loop_control:
         loop_var: app
       tags: [always]
@@ -22,14 +22,15 @@
       tags: [always]
     - name: Capture statuses
       ansible.builtin.command:
-        cmd: docker {{ docker_entity }} inspect {{ app.image.name }}:{{ image_cids[app.name][:7] }}-{{ devenv }}
+        cmd: docker {{ docker_entity }} inspect {{ app.image }}:{{ image_cids[app.binary][:7] }}-{{ devenv }}
       register: image_status
-      changed_when: image_status.rc != 0
+      changed_when:
+        - image_status.rc != 0
       failed_when: false
-      loop: "{{ solution.apps.values() }}"
+      loop: "{{ solution.apps.values()|flatten }}"
       loop_control:
         loop_var: app
-        label: "{{ app.binary.name }}"
+        label: "{{ app.binary }}"
       tags: [always]
     - name: Status commands
       ansible.builtin.debug:
@@ -47,8 +48,8 @@
           --projects {{
             image_status.results
             | select('changed')
-            | map(attribute='app.binary.name')
-            | map('regex_replace', '^', 'apps/')
+            | map(attribute='app.binary')
+            | map('regex_replace', '^', ':')
             | join(',')
           }}
           --also-make

.dx/images.yaml

@@ -5,19 +5,18 @@
   tags: [binaries, deps]
 
 - name: Images
-  hosts: schema
+  hosts: db
   run_once: true
   tasks:
     - name: Capture statuses
       ansible.builtin.command:
-        cmd: docker {{ docker_entity }} inspect {{ schema.image.name }}:{{ schema.image.tag }}
+        cmd: docker {{ docker_entity }} inspect {{ solution.databases[storage].image }}:{{ solution.databases[storage].cid }}
       register: image_status
       changed_when: image_status.rc != 0
       failed_when: false
-      loop: "{{ solution.schemas.values() }}"
+      loop: "{{ solution.schemas.keys() }}"
       loop_control:
-        loop_var: schema
-        label: "{{ schema.name }}"
+        loop_var: storage
     - name: Status commands
       ansible.builtin.debug:
         msg: "{{ image_status.results|map(attribute='cmd')|map('join', ' ') }}"
@@ -26,14 +25,13 @@
       ansible.builtin.include_role:
         name: image
       vars:
-        image_tag: "{{ schema.image.tag }}"
-        image_name: "{{ schema.image.name }}"
-        image_home: "{{ playbook_dir }}/../schemas/{{ solution.storage.vendor }}"
+        image_tag: "{{ solution.databases[storage].cid }}"
+        image_name: "{{ solution.databases[storage].image }}"
+        image_home: "{{ playbook_dir }}/../databases/{{ storage }}"
         image_push: "{{ image_storage != 'local' }}"
-      loop: "{{ image_status.results|select('changed')|map(attribute='schema') }}"
+      loop: "{{ image_status.results|select('changed')|map(attribute='storage') }}"
       loop_control:
-        loop_var: schema
-        label: "{{ schema.name }}"
+        loop_var: storage
 
 - name: Images
   hosts: app
@@ -56,15 +54,15 @@
       ansible.builtin.include_role:
         name: image
       vars:
-        image_tag: "{{ image_cids[app.name][:7] }}-{{ devenv }}"
-        image_name: "{{ app.image.name }}"
-        image_home: "{{ playbook_dir }}/../apps/{{ app.binary.name }}"
+        image_tag: "{{ image_cids[app.binary][:7] }}-{{ devenv }}"
+        image_name: "{{ app.image }}"
+        image_home: "{{ playbook_dir }}/../apps/{{ app.binary }}"
         image_context: target/docker-context
         image_push: "{{ image_storage != 'local' }}"
         image_args:
           JAVA_RELEASE: "{{ dev[devenv].jdk.release }}"
       loop: "{{ image_status.results|select('changed')|map(attribute='app') }}"
       loop_control:
         loop_var: app
-        label: "{{ app.binary.name }}"
+        label: "{{ app.binary }}"
       when: image_status is changed

.dx/inventory/aliases.yaml

@@ -1,21 +1,17 @@
 ---
-all:
-  hosts:
-    app:
-    schema:
-    test:
-  vars:
-    ansible_connection: local
 codebase:
   hosts:
     java:
     ansible:
     github:
-  vars:
-    ansible_connection: local
 stack:
   hosts:
     solution:
     toolchain:
+all:
+  hosts:
+    db:
+    app:
+    test:
   vars:
     ansible_connection: local

.dx/inventory/group_vars/all/aims.yaml

@@ -0,0 +1,11 @@
+---
+aim: toy
+aims:
+  toy:
+    storage: postgres
+    apps:
+      - sepuling
+  func:
+    storage: postgres
+    apps:
+      - sepuling

.dx/inventory/group_vars/all/envs.yaml

@@ -25,8 +25,7 @@ ops:
       vendor: postgres
       version: 14.9
       mapping_mode: my_batis
-    runtime:
-      release: 17
+    app:
       lang: java
     config:
       mapping_mode: lightbend_config
@@ -35,8 +34,7 @@ ops:
       vendor: postgres
       version: 15.4
       mapping_mode: my_batis
-    runtime:
-      release: 19
+    app:
       lang: kotlin
     config:
       mapping_mode: lightbend_config
@@ -45,8 +43,7 @@ ops:
       vendor: postgres
       version: 15.4
       mapping_mode: spring_data
-    runtime:
-      release: 19
+    app:
       lang: kotlin
     config:
       mapping_mode: spring_config
@@ -55,8 +52,7 @@ ops:
       vendor: postgres
       version: 16.0
       mapping_mode: spring_data
-    runtime:
-      release: 21
+    app:
       lang: java
     config:
       mapping_mode: spring_config

.dx/inventory/group_vars/all/stacks.yaml

@@ -3,36 +3,40 @@ toolchain:
   image:
     name: "{{ image_repo }}/stack/toolchain"
 
-app_name: "sepuling-{{ ops[opsenv].runtime.lang }}"
-
 solution:
-  name: "{{ project_name }}"
+  name: "{{ project.name }}"
   cid: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=stacks/solution')[:7] }}"
   image:
-    name: "{{ image_repo }}/stack/solution-{{ usecase }}"
+    name: "{{ image_repo }}/stack/solution-{{ aim }}"
   config:
     file_name: "application.{{ config_exts[ops[opsenv].config.mapping_mode] }}"
     mapping_mode: "{{ ops[opsenv].config.mapping_mode }}"
-  storage: "{{ ops[opsenv].storage }}"
-  database:
-    name: "{{ project_name }}"
-  schemas:
-    sepulkarium:
-      name: sepulkarium
-      image:
-        name: "{{ image_repo }}/schema/{{ ops[opsenv].storage.vendor }}"
-        tag: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=schemas/' ~ ops[opsenv].storage.vendor)[:7] }}"
+  storages:
+    postgres:
+      image: "docker.io/library/postgres"
+      dba:
+        username: "postgres"
+        password: "password"
       owner:
-        name: "{{ project_name }}"
-        password: "{{ project_name }}"
+        username: "{{ project.name }}"
+        password: "{{ project.name }}"
+  databases:
+    postgres:
+      name: "{{ project.name }}"
+      cid: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=databases/postgres')[:7] }}"
+      image: "{{ image_repo }}/database/postgres"
+  schemas:
+    postgres:
+      - name: sepulkarium
   apps:
-    sepuling:
-      name: sepuling
-      cid: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=apps/' ~ app_name)[:7] }}"
-      binary:
-        name: "{{ app_name }}"
-      image:
-        name: "{{ image_repo }}/app/{{ app_name }}"
+    java:
+      - service: sepuling
+        image: "{{ image_repo }}/app/sepuling-java"
+        binary: sepuling-java
+    kotlin:
+      - service: sepuling
+        image: "{{ image_repo }}/app/sepuling-kotlin"
+        binary: sepuling-kotlin
 
 config_exts:
   lightbend_config: conf

.dx/inventory/group_vars/all/vars.yaml

@@ -0,0 +1,11 @@
+---
+project:
+  name: bezmen
+  org: smecalculus
+
+binary_storage: local
+image_storage: local
+
+image_repo: "{{ image_storage }}/{{ project.org }}/{{ project.name }}"
+
+docker_entity: "{{ 'image' if image_storage == 'local' else 'manifest' }}"

.dx/tasks/solution/build.yaml

@@ -14,13 +14,14 @@
   ansible.builtin.template:
     src: "{{ stack_dir }}/{{ solution.config.mapping_mode }}.j2"
     dest: "{{ stack_dir }}/target/context/application.{{ config_exts[solution.config.mapping_mode] }}"
+    lstrip_blocks: yes
+    trim_blocks: yes
     mode: "644"
-  vars:
-    # TODO: multiple schemas in config
-    schema: "{{ solution.schemas.values()|first }}"
 
 - name: Build spec
   ansible.builtin.template:
     src: "{{ stack_dir }}/compose.j2"
     dest: "{{ stack_dir }}/target/context/compose.yaml"
+    lstrip_blocks: yes
+    trim_blocks: yes
     mode: "644"

.dx/tasks/solution/status.yaml

@@ -3,10 +3,10 @@
   ansible.builtin.command:
     cmd: git hash-object --stdin
     stdin: |
-      {{ lib_cid }}
-      {{ app_cid }}
-      {{ schema_cid }}
-      {{ solution.cid }}
+      {{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=libs')[:7] }}
+      {{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=apps')[:7] }}
+      {{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=databases')[:7] }}
+      {{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=stacks/solution')[:7] }}
   register: stack_cid
   changed_when: false
 

.dx/tasks/solution/test.yaml

@@ -3,7 +3,7 @@
   ansible.builtin.command:
     cmd: docker rm -f env-db
   changed_when: false
-  when: hostvars.schema.image_status|default({}) is changed
+  when: hostvars.db.image_status|default({}) is changed
 
 - name: Create stand
   ansible.builtin.command:
@@ -28,7 +28,7 @@
       --batch-mode
       --threads 2
       --projects tests/e2e
-      --activate-profiles {{ usecase }}
+      --activate-profiles {{ aim }}
       --also-make
       clean
       test

.dx/tasks/toolchain/status.yaml

@@ -3,10 +3,10 @@
   ansible.builtin.command:
     cmd: git hash-object --stdin
     stdin: |
-      {{ dx_cid }}
-      {{ env_cid }}
-      {{ tool_cid }}
-      {{ test_cid }}
+      {{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=.dx')[:7] }}
+      {{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=envs')[:7] }}
+      {{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=tools')[:7] }}
+      {{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=tests')[:7] }}
   register: stack_cid
   changed_when: false
 

.github/dependabot.yaml

@@ -18,7 +18,7 @@ updates:
         patterns:
           - "org.junit*"
   - package-ecosystem: "docker"
-    directory: "/schemas/postgres"
+    directory: "/databases/postgres"
     schedule:
       interval: "weekly"
   - package-ecosystem: "pip"