Import with vars files

.dx/inventory/group_vars/all.yaml

@@ -14,14 +14,15 @@ app_cids:
 schema_cid: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=schemas')[:7] }}"
 schema_cids:
   postgres: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=schemas/postgres')[:7] }}"
-solution_cid: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=solutions')[:7] }}"
 
 test_cid: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=tests')[:7] }}"
 
 dx_cid: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=.dx')[:7] }}"
 env_cid: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=envs')[:7] }}"
 tool_cid: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=tools')[:7] }}"
-pipeline_cid: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=.github')[:7] }}"
+
+stack_cids:
+  solution: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=stacks/solution')[:7] }}"
 
 binary_repo: local
 image_repo: local

.dx/stacks.yaml

@@ -21,8 +21,9 @@
 - name: Testing
   hosts: stack
   run_once: true
+  vars_files:
+    - "{{ playbook_dir }}/../envs/ops/{{ opsenv }}/vars.yaml"
   vars:
-    solutions_dir: "{{ playbook_dir }}/../solutions"
     stack_dir: "{{ playbook_dir }}/../stacks/solution"
   tasks:
     - ansible.builtin.import_tasks:  # noqa: name[missing]

.dx/tasks/solution/build.yaml

@@ -10,15 +10,10 @@
     state: directory
     recurse: true
 
-- name: Capture env
-  ansible.builtin.include_vars:
-    file: ../envs/ops/{{ opsenv }}/vars.yaml
-    name: ops
-
 - name: Build conf
   ansible.builtin.template:
     src: "../envs/ops/{{ opsenv }}/config.j2"
-    dest: "{{ stack_dir }}/target/context/application.{{ config_exts[ops.config_mapping_mode] }}"
+    dest: "{{ stack_dir }}/target/context/application.{{ config_exts[application.config.mapping_mode] }}"
     mode: "644"
   vars:
     storage_name: postgres
@@ -36,11 +31,8 @@
     stack:
       name: "{{ project_name }}"
       config:
-        file_name: "application.{{ config_exts[ops.config_mapping_mode] }}"
-        mapping_mode: "{{ ops.config_mapping_mode }}"
-    storage:
-      name: postgres
-      version: "{{ ops.postgres_version }}"
+        file_name: "application.{{ config_exts[application.config.mapping_mode] }}"
+        mapping_mode: "{{ application.config.mapping_mode }}"
     database:
       name: "{{ project_name }}"
     schemas:
@@ -54,5 +46,5 @@
     apps:
       - name: sepuling
         image:
-          name: "{{ app_images['sepuling-' ~ ops.lang_mode] }}"
-          tag: "{{ hostvars.app.image_cids['sepuling-' ~ ops.lang_mode][:7] }}-{{ devenv }}"
+          name: "{{ app_images['sepuling-' ~ runtime.lang] }}"
+          tag: "{{ hostvars.app.image_cids['sepuling-' ~ runtime.lang][:7] }}-{{ devenv }}"

.dx/tasks/solution/status.yaml

@@ -6,7 +6,7 @@
       {{ lib_cid }}
       {{ app_cid }}
       {{ schema_cid }}
-      {{ solution_cid }}
+      {{ stack_cids.solution }}
   register: stack_cid
   changed_when: false
 

envs/ops/lamport/vars.yaml

@@ -1,5 +1,10 @@
 ---
-postgres_version: 15.4
-java_release: 19
-lang_mode: kotlin
-config_mapping_mode: lightbend_config
+storage:
+  name: postgres
+  version: 15.4
+runtime:
+  release: 19
+  lang: kotlin
+application:
+  config:
+    mapping_mode: lightbend_config

envs/ops/milner/vars.yaml

@@ -1,5 +1,10 @@
 ---
-postgres_version: 15.4
-java_release: 19
-lang_mode: kotlin
-config_mapping_mode: spring_config
+storage:
+  name: postgres
+  version: 15.4
+runtime:
+  release: 19
+  lang: kotlin
+application:
+  config:
+    mapping_mode: spring_config

envs/ops/nakamoto/vars.yaml

@@ -1,5 +1,10 @@
 ---
-postgres_version: 16.0
-java_release: 21
-lang_mode: java
-config_mapping_mode: spring_config
+storage:
+  name: postgres
+  version: 16.0
+runtime:
+  release: 21
+  lang: java
+application:
+  config:
+    mapping_mode: spring_config

envs/ops/shannon/vars.yaml

@@ -1,5 +1,10 @@
 ---
-postgres_version: 14.9
-java_release: 17
-lang_mode: java
-config_mapping_mode: lightbend_config
+storage:
+  name: postgres
+  version: 14.9
+runtime:
+  release: 17
+  lang: java
+application:
+  config:
+    mapping_mode: lightbend_config

tests/props/lamport.properties

@@ -1,2 +1,2 @@
 storage.protocol.mode=postgres
-storage.mapping.mode=spring_data
+storage.mapping.mode=my_batis

tests/props/nakamoto.properties

@@ -0,0 +1,2 @@
+storage.protocol.mode=postgres
+storage.mapping.mode=spring_data