Add resilience focus

.github/workflows/work_proposal.yaml

@@ -76,7 +76,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        focus: [api]
+        focus: [api, resilience]
         env:
           - dev: godel
             ops: marx
@@ -119,7 +119,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        focus: [api]
+        focus: [api, resilience]
         shard: [0, 1]
         env:
           - dev: godel
@@ -173,7 +173,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        focus: [api]
+        focus: [api, resilience]
         env:
           - dev: godel
             ops: marx

baker/ansible/tasks/product/build.yaml

@@ -1,7 +1,7 @@
 ---
-- name: Remove artifacts
+- name: Clean artifacts
   ansible.builtin.file:
-    path: "{{ stack_dir }}/target"
+    path: "{{ stack_dir }}/target/{{ focus }}"
     state: absent
   changed_when: false
 
@@ -12,18 +12,22 @@
     recurse: true
   changed_when: false
 
-- name: Build conf
-  ansible.builtin.template:
-    src: "{{ stack_dir }}/focus/{{ focus }}/{{ ops.config.mapping_mode }}.j2"
-    dest: "{{ stack_dir }}/target/{{ focus }}/{{ ops.config.file_name }}"
-    lstrip_blocks: yes
-    trim_blocks: yes
+- name: Copy configs
+  ansible.builtin.copy:
+    src: "{{ item }}"
+    dest: "{{ stack_dir }}/target/{{ focus }}/"
     mode: "644"
+  changed_when: false
+  with_fileglob:
+    - "{{ stack_dir }}/focus/{{ focus }}/*.conf"
 
-- name: Build spec
+- name: Render templates
   ansible.builtin.template:
-    src: "{{ stack_dir }}/focus/{{ focus }}/compose.j2"
-    dest: "{{ stack_dir }}/target/{{ focus }}/compose.yaml"
+    src: "{{ item }}"
+    dest: "{{ stack_dir }}/target/{{ focus }}/{{ item | basename | splitext | first }}"
     lstrip_blocks: yes
     trim_blocks: yes
     mode: "644"
+  changed_when: false
+  with_fileglob:
+    - "{{ stack_dir }}/focus/{{ focus }}/*.jinja"

baker/ansible/tasks/product/check.yaml

@@ -1,14 +1,5 @@
 ---
-- name: Remove storages
-  ansible.builtin.command:
-    cmd: docker container rm -fv storage-{{ vendor }}
-  changed_when: false
-  loop: "{{ product.databases.keys() }}"
-  loop_control:
-    loop_var: vendor
-  when: hostvars.db.image_status is changed
-
-- name: Create network
+- name: Create networks
   ansible.builtin.shell:
     cmd: docker network inspect gear || docker network create gear
     strip_empty_ends: false
@@ -19,7 +10,6 @@
     cmd: >-
       docker compose
         --file compose.yaml
-        --profile {{ opsenv }}
         up
         --remove-orphans
         --quiet-pull

baker/ansible/tasks/product/publish.yaml

@@ -4,15 +4,15 @@
     tasks_from: clean
   vars:
     image_keys:
-      - "{{ product.image }}/{{ opsenv }}"
+      - "product/{{ focus }}/{{ opsenv }}"
 
 - ansible.builtin.import_role:  # noqa: name[missing]
     name: image
     tasks_from: build
   vars:
     image_home: "{{ project.dir }}/{{ product.image }}"
     image_context: target/{{ focus }}
-    image_key: "{{ product.image }}/{{ opsenv }}"
+    image_key: "product/{{ focus }}/{{ opsenv }}"
     image_tag: "{{ product.image }}:{{ opsenv }}"
 
 - ansible.builtin.import_role:  # noqa: name[missing]

stack/product/focus/api/lightbend_config.j2 → stack/product/focus/api/application.conf.jinja

@@ -11,7 +11,7 @@ product {
     protocol {
       mode = {{ ops.storage.vendor }}
       {{ ops.storage.vendor }} {
-        url = "jdbc:postgresql://storage:5432/{{ database.name }}"
+        url = "jdbc:postgresql://storage-{{ ops.storage.vendor }}:5432/{{ database.name }}"
         schema = "{{ schema.name }}"
         username = "{{ storage.owner.username }}"
         password = "{{ storage.owner.password }}"

stack/product/focus/api/spring_config.j2 → stack/product/focus/api/application.yaml.jinja

@@ -1,7 +1,7 @@
----
 {% set storage = product.storages[ops.storage.vendor] %}
 {% set database = product.databases[ops.storage.vendor] %}
 {% set schema = product.schemas[ops.storage.vendor] %}
+---
 product:
   messaging:
     mapping:
@@ -10,7 +10,7 @@ product:
     protocol:
       mode: {{ ops.storage.vendor }}
       {{ ops.storage.vendor }}:
-        url: "jdbc:postgresql://storage:5432/{{ database.name }}"
+        url: "jdbc:postgresql://storage-{{ ops.storage.vendor }}:5432/{{ database.name }}"
         schema: "{{ schema.name }}"
         username: "{{ storage.owner.username }}"
         password: "{{ storage.owner.password }}"

stack/product/focus/api/compose.j2 → stack/product/focus/api/compose.yaml.jinja

@@ -1,26 +1,30 @@
+{% set storage = product.storages[ops.storage.vendor] %}
+{% set database = product.databases[ops.storage.vendor] %}
+{% set schema = product.schemas[ops.storage.vendor] %}
+{% set app = product.apps[ops.app.name] %}
 ---
-name: focus-api
+name: {{ project.name }}
 
 networks:
   product:
     name: product
+    external: false
   gear:
     name: gear
     external: true
 
 configs:
-  product_config:
-    file: ./{{ ops.config.file_name }}
+  product:
+    file: {{ ops.config.file_name }}
 
 services:
-{% set storage = product.storages[ops.storage.vendor] %}
-  storage:
-    container_name: storage-{{ ops.storage.vendor }}
+  storage-{{ ops.storage.vendor }}:
+    container_name: {{ project.name }}-storage-{{ ops.storage.vendor }}
     image: {{ storage.image }}:{{ ops.storage.version }}-alpine
     networks:
       - product
     ports:
-      - 5432:5432
+      - "5432:5432"
     environment:
       POSTGRES_USER: "{{ storage.dba.username }}"
       POSTGRES_PASSWORD: "{{ storage.dba.password }}"
@@ -29,23 +33,22 @@ services:
       interval: 10s
       timeout: 5s
       retries: 5
+    labels:
+      image.key: db/{{ ops.storage.vendor }}/{{ devenv }}
 
-{% set database = product.databases[ops.storage.vendor] %}
-  database:
-    container_name: database-{{ database.name }}
+  database-{{ database.name }}:
+    container_name: {{ project.name }}-database-{{ database.name }}
     image: {{ image_ns }}/db/{{ ops.storage.vendor }}:{{ hostvars.db.image_tags[ops.storage.vendor] }}
-    networks:
-      - product
     depends_on:
-      storage:
+      storage-{{ ops.storage.vendor }}:
         condition: service_healthy
-    labels:
-      image.key: db/{{ ops.storage.vendor }}/{{ devenv }}
+    networks:
+      - product
     command: >-
       --show-banner=false
       --classpath=/liquibase/changelog
       --changelog-file=dba/changelog.yaml
-      --url=jdbc:postgresql://storage:5432/postgres
+      --url=jdbc:postgresql://storage-{{ ops.storage.vendor }}:5432/postgres
       --liquibase-schema-name=public
       --default-schema-name=public
       --username={{ storage.dba.username }}
@@ -55,47 +58,47 @@ services:
       -Ddatabase.name={{ database.name }}
       -Downer.username={{ storage.owner.username }}
       -Downer.password={{ storage.owner.password }}
+    labels:
+      image.key: db/{{ ops.storage.vendor }}/{{ devenv }}
 
-{% set schema = product.schemas[ops.storage.vendor] %}
-  {{ schema.name }}:
-    container_name: schema-{{ schema.name }}
+  schema-{{ schema.name }}:
+    container_name: {{ project.name }}-schema-{{ schema.name }}
     image: {{ image_ns }}/db/{{ ops.storage.vendor }}:{{ hostvars.db.image_tags[ops.storage.vendor] }}
-    networks:
-      - product
     depends_on:
-      database:
+      database-{{ database.name }}:
         condition: service_completed_successfully
-    labels:
-      image.key: db/{{ ops.storage.vendor }}/{{ devenv }}
+    networks:
+      - product
     command: >-
       --show-banner=false
       --classpath=/liquibase/changelog
       --changelog-file=owner/changelog.yaml
-      --url=jdbc:postgresql://storage:5432/{{ database.name }}
+      --url=jdbc:postgresql://storage-{{ ops.storage.vendor }}:5432/{{ database.name }}
       --liquibase-schema-name=public
       --default-schema-name={{ schema.name }}
       --username={{ storage.owner.username }}
       --password={{ storage.owner.password }}
       update
       -Dschema.name={{ schema.name }}
+    labels:
+      image.key: db/{{ ops.storage.vendor }}/{{ devenv }}
 
-{% set app = product.apps[ops.app.name] %}
-  {{ app.service }}:
-    container_name: app-{{ app.service }}
+  app-{{ app.service }}:
+    container_name: {{ project.name }}-app-{{ app.service }}
     image: {{ image_ns }}/app/{{ ops.app.name }}:{{ hostvars.app.image_tags[ops.app.name] }}
+    depends_on:
+      schema-{{ schema.name }}:
+        condition: service_completed_successfully
     networks:
       - product
       - gear
     ports:
-      - 8080:8080
+      - "8080:8080"
     configs:
-      - source: product_config
+      - source: product
         target: /home/app/{{ ops.config.file_name }}
     command: >-
       --product.config.mapping.mode={{ ops.config.mapping_mode }}
       --spring.config.location=optional:file:application.yaml
-    depends_on:
-      {{ schema.name }}:
-        condition: service_completed_successfully
     labels:
       image.key: app/{{ ops.app.name }}/{{ devenv }}

stack/product/focus/resilience/application.conf.jinja

@@ -0,0 +1,24 @@
+{% set storage = product.storages[ops.storage.vendor] %}
+{% set database = product.databases[ops.storage.vendor] %}
+{% set schema = product.schemas[ops.storage.vendor] %}
+product {
+  messaging {
+    mapping {
+      modes = [spring_mvc, spring_management]
+    }
+  }
+  storage {
+    protocol {
+      mode = {{ ops.storage.vendor }}
+      {{ ops.storage.vendor }} {
+        url = "jdbc:postgresql://{{ ops.storage.vendor }}-primary:5432,{{ ops.storage.vendor }}-secondary:5432/{{ database.name }}"
+        schema = "{{ schema.name }}"
+        username = "{{ storage.owner.username }}"
+        password = "{{ storage.owner.password }}"
+      }
+    }
+    mapping {
+      mode = {{ ops.storage.mapping_mode }}
+    }
+  }
+}

stack/product/focus/resilience/application.yaml.jinja

@@ -0,0 +1,18 @@
+{% set storage = product.storages[ops.storage.vendor] %}
+{% set database = product.databases[ops.storage.vendor] %}
+{% set schema = product.schemas[ops.storage.vendor] %}
+---
+product:
+  messaging:
+    mapping:
+      modes: [spring_mvc, spring_management]
+  storage:
+    protocol:
+      mode: {{ ops.storage.vendor }}
+      {{ ops.storage.vendor }}:
+        url: "jdbc:postgresql://{{ ops.storage.vendor }}-primary:5432,{{ ops.storage.vendor }}-secondary:5432/{{ database.name }}"
+        schema: "{{ schema.name }}"
+        username: "{{ storage.owner.username }}"
+        password: "{{ storage.owner.password }}"
+    mapping:
+      mode: {{ ops.storage.mapping_mode }}