From 1d631ce84b78d4684ab1ea51098fda43d16d7a06 Mon Sep 17 00:00:00 2001
From: Andy Thompson <athompson@inviqa.com>
Date: Fri, 15 Dec 2023 09:24:21 +0000
Subject: [PATCH 1/3] Add database and searchengine templates for
 services.*.extends support

```yaml
services:
  console:
    extends:
      - _database-access
      - _searchengine-access
```
---
 harness/attributes/docker-01-base.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/harness/attributes/docker-01-base.yml b/harness/attributes/docker-01-base.yml
index d5a3274..071b539 100644
--- a/harness/attributes/docker-01-base.yml
+++ b/harness/attributes/docker-01-base.yml
@@ -1,5 +1,21 @@
 attributes.default:
   services:
+    _database-access:
+      environment:
+        DB_PLATFORM: = @('database.platform')
+        DB_PLATFORM_VERSION: = @('database.platform_version')
+        DB_HOST: = @('database.host')
+        DB_PORT: = @('database.port')
+        DB_USER: = @('database.user')
+        DB_NAME: = @('database.name')
+    _searchengine-access:
+      environment:
+        SEARCHENGINE_PLATFORM: = @('searchengine.platform')
+        SEARCHENGINE_HOST: = @('searchengine.host')
+        SEARCHENGINE_PORT: = @('searchengine.port')
+        SEARCHENGINE_SCHEME: http
+        # SEARCHENGINE_USERNAME: ~
+        # SEARCHENGINE_PASSWORD: ~
     console:
       enabled: true
       build:

From a6cb7f6a1f10bb0baed4eedf53695491cadc1b9e Mon Sep 17 00:00:00 2001
From: andytson-inviqa <andytson-inviqa@users.noreply.github.com>
Date: Fri, 15 Dec 2023 09:27:53 +0000
Subject: [PATCH 2/3] Include passwords in environment_secret

---
 harness/attributes/docker-01-base.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/harness/attributes/docker-01-base.yml b/harness/attributes/docker-01-base.yml
index 071b539..e08f452 100644
--- a/harness/attributes/docker-01-base.yml
+++ b/harness/attributes/docker-01-base.yml
@@ -8,14 +8,17 @@ attributes.default:
         DB_PORT: = @('database.port')
         DB_USER: = @('database.user')
         DB_NAME: = @('database.name')
+      environment_secrets:
+        DB_PASS: = @('database.pass')
     _searchengine-access:
       environment:
         SEARCHENGINE_PLATFORM: = @('searchengine.platform')
         SEARCHENGINE_HOST: = @('searchengine.host')
         SEARCHENGINE_PORT: = @('searchengine.port')
         SEARCHENGINE_SCHEME: http
-        # SEARCHENGINE_USERNAME: ~
-        # SEARCHENGINE_PASSWORD: ~
+      #   SEARCHENGINE_USERNAME: ~
+      # environment_secrets:
+      #   SEARCHENGINE_PASSWORD: ~
     console:
       enabled: true
       build:

From 0dc00f2806e69441ab6ccaff0fade83d614ec54f Mon Sep 17 00:00:00 2001
From: Andy Thompson <athompson@inviqa.com>
Date: Fri, 15 Dec 2023 09:36:00 +0000
Subject: [PATCH 3/3] Add extends to static-all-services test

---
 .ci/sample-static-all-services/workspace.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.ci/sample-static-all-services/workspace.yml b/.ci/sample-static-all-services/workspace.yml
index 9c07abc..ea691a1 100644
--- a/.ci/sample-static-all-services/workspace.yml
+++ b/.ci/sample-static-all-services/workspace.yml
@@ -8,6 +8,10 @@ attribute('app.build'): static
 
 attributes:
   services:
+    console:
+      extends:
+        - _database-access
+        - _searchengine-access
     chrome:
       enabled: true
     elasticsearch: