From 876ff4abd300ff8085c104a5fbacbb366adbb0a2 Mon Sep 17 00:00:00 2001
From: Jamie <jamie.h.bate@gmail.com>
Date: Tue, 7 Mar 2023 10:41:29 +1300
Subject: [PATCH 1/7] updates for device logs

---
 charts/tidepool/charts/blob/templates/1-deployment.yaml | 2 ++
 charts/tidepool/charts/blob/templates/4-routetable.yaml | 8 ++++++++
 charts/tidepool/charts/blob/values.yaml                 | 3 +++
 docker-compose.yml                                      | 1 +
 4 files changed, 14 insertions(+)

diff --git a/charts/tidepool/charts/blob/templates/1-deployment.yaml b/charts/tidepool/charts/blob/templates/1-deployment.yaml
index caef0f2c7..5b7ba65bf 100644
--- a/charts/tidepool/charts/blob/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/blob/templates/1-deployment.yaml
@@ -64,6 +64,8 @@ spec:
           value: '{{.Values.deployment.env.store.s3.prefix}}'
         - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_TYPE
           value: '{{.Values.deployment.env.store.type}}'
+        - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_LOGS_BUCKET_LOGS_BUCKET
+          value: '{{.Values.deployment.env.store.logs_bucket.logs_bucket}}'
         image: "{{ .Values.deployment.image }}"
         securityContext:
           {{- .Values.podSecurityContext | toYaml | nindent 10 }}
diff --git a/charts/tidepool/charts/blob/templates/4-routetable.yaml b/charts/tidepool/charts/blob/templates/4-routetable.yaml
index 388edd3a9..2e59181e1 100644
--- a/charts/tidepool/charts/blob/templates/4-routetable.yaml
+++ b/charts/tidepool/charts/blob/templates/4-routetable.yaml
@@ -36,4 +36,12 @@ spec:
       single:
         upstream:
           name: blob
+  - matchers:
+    - methods:
+      - POST
+      regex: /v1/users/[^/]+/device-logs
+    routeAction:
+      single:
+        upstream:
+          name: blob
 {{- end }}
diff --git a/charts/tidepool/charts/blob/values.yaml b/charts/tidepool/charts/blob/values.yaml
index b74977358..32d02e593 100644
--- a/charts/tidepool/charts/blob/values.yaml
+++ b/charts/tidepool/charts/blob/values.yaml
@@ -14,6 +14,9 @@ deployment:
         # -- S3 bucket where blob data is written
         bucket: "data"
         prefix: "blobs"
+      logs_bucket:
+        logs_bucket: "device_logs"
+        prefix: "blobs"
       file:
         prefix: "blobs"
         # -- directory to use when storing blobs on file storage
diff --git a/docker-compose.yml b/docker-compose.yml
index 3dd002235..2f7d4441a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -275,6 +275,7 @@ services:
       TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_FILE_DIRECTORY: ${TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_STORE_FILE_DIRECTORY}
       TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_BUCKET: ${TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_BUCKET}
       TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_PREFIX: ${TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_PREFIX}
+      TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_LOGS_BUCKET_LOGS_BUCKET: ${TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_LOGS_BUCKET_LOGS_BUCKET}
       TIDEPOOL_IMAGE_SERVICE_UNSTRUCTURED_STORE_TYPE: ${TIDEPOOL_DOCKER_PLATFORM_IMAGE_SERVICE_UNSTRUCTURED_STORE_TYPE}
       TIDEPOOL_IMAGE_SERVICE_UNSTRUCTURED_STORE_FILE_DIRECTORY: ${TIDEPOOL_DOCKER_PLATFORM_IMAGE_SERVICE_UNSTRUCTURED_STORE_FILE_DIRECTORY}
       TIDEPOOL_IMAGE_SERVICE_UNSTRUCTURED_STORE_S3_BUCKET: ${TIDEPOOL_DOCKER_PLATFORM_IMAGE_SERVICE_UNSTRUCTURED_STORE_S3_BUCKET}

From d1f6855a0f7f7270f58c6b2e8d76775558c642b8 Mon Sep 17 00:00:00 2001
From: Jamie <jamie.h.bate@gmail.com>
Date: Wed, 8 Mar 2023 08:01:43 +1300
Subject: [PATCH 2/7] change logs_bucket config location

---
 charts/tidepool/charts/blob/templates/1-deployment.yaml | 4 ++--
 charts/tidepool/charts/blob/values.yaml                 | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/charts/tidepool/charts/blob/templates/1-deployment.yaml b/charts/tidepool/charts/blob/templates/1-deployment.yaml
index 5b7ba65bf..ecd7e94f1 100644
--- a/charts/tidepool/charts/blob/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/blob/templates/1-deployment.yaml
@@ -62,10 +62,10 @@ spec:
           value: '{{ .Values.deployment.env.store.s3.bucket }}'
         - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_PREFIX
           value: '{{.Values.deployment.env.store.s3.prefix}}'
+        - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_LOGS_BUCKET
+          value: '{{ .Values.deployment.env.store.s3.logs_bucket }}'
         - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_TYPE
           value: '{{.Values.deployment.env.store.type}}'
-        - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_LOGS_BUCKET_LOGS_BUCKET
-          value: '{{.Values.deployment.env.store.logs_bucket.logs_bucket}}'
         image: "{{ .Values.deployment.image }}"
         securityContext:
           {{- .Values.podSecurityContext | toYaml | nindent 10 }}
diff --git a/charts/tidepool/charts/blob/values.yaml b/charts/tidepool/charts/blob/values.yaml
index 32d02e593..f368001f6 100644
--- a/charts/tidepool/charts/blob/values.yaml
+++ b/charts/tidepool/charts/blob/values.yaml
@@ -14,9 +14,7 @@ deployment:
         # -- S3 bucket where blob data is written
         bucket: "data"
         prefix: "blobs"
-      logs_bucket:
         logs_bucket: "device_logs"
-        prefix: "blobs"
       file:
         prefix: "blobs"
         # -- directory to use when storing blobs on file storage

From 7017e5e0562da8988eaccd7f05e64f9bd1ec819a Mon Sep 17 00:00:00 2001
From: Jamie <jamie.h.bate@gmail.com>
Date: Wed, 8 Mar 2023 08:06:44 +1300
Subject: [PATCH 3/7] addition of S3_LOGS_BUCKET

---
 .env | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.env b/.env
index f566549e7..0e9f585f0 100644
--- a/.env
+++ b/.env
@@ -81,6 +81,7 @@ TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_STORE_TYPE=file
 TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_STORE_FILE_DIRECTORY=_data/blobs
 TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_BUCKET=
 TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_PREFIX=
+TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_LOGS_BUCKET=
 
 # platform-data
 TIDEPOOL_DOCKER_PLATFORM_DATA_BUILD_TARGET=release

From 14c788c389ec020b78b9f14c28c18caff9c96196 Mon Sep 17 00:00:00 2001
From: Jamie <jamie.h.bate@gmail.com>
Date: Wed, 8 Mar 2023 13:10:03 +1300
Subject: [PATCH 4/7] seperate out config for blobs and device_logs

---
 .env                                          |  7 +++-
 .../charts/blob/templates/1-deployment.yaml   | 18 ++++++----
 charts/tidepool/charts/blob/values.yaml       | 33 ++++++++++++-------
 3 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/.env b/.env
index 0e9f585f0..bb2b1c44a 100644
--- a/.env
+++ b/.env
@@ -77,11 +77,16 @@ TIDEPOOL_DOCKER_PLATFORM_BLOB_DIR=platform/src/github.com/tidepool-org/platform
 TIDEPOOL_DOCKER_PLATFORM_BLOB_HOST=platform-blob
 TIDEPOOL_DOCKER_PLATFORM_BLOB_PORT_PREFIX=
 TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_SECRET=Service secret used for interservice requests with the blob service
+
 TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_STORE_TYPE=file
 TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_STORE_FILE_DIRECTORY=_data/blobs
 TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_BUCKET=
 TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_PREFIX=
-TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_LOGS_BUCKET=
+TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_TYPE=file
+TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_FILE_DIRECTORY=_data/device_logs
+TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_S3_BUCKET=
+TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_S3_PREFIX=
+
 
 # platform-data
 TIDEPOOL_DOCKER_PLATFORM_DATA_BUILD_TARGET=release
diff --git a/charts/tidepool/charts/blob/templates/1-deployment.yaml b/charts/tidepool/charts/blob/templates/1-deployment.yaml
index ecd7e94f1..6dd749119 100644
--- a/charts/tidepool/charts/blob/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/blob/templates/1-deployment.yaml
@@ -57,15 +57,21 @@ spec:
         - name: TIDEPOOL_BLOB_SERVICE_SERVER_ADDRESS
           value: :{{.Values.global.ports.blob}}
         - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_FILE_DIRECTORY
-          value: '{{.Values.deployment.env.store.file.directory}}'
+          value: '{{.Values.deployment.env.store.blobs.file.directory}}'
         - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_BUCKET
-          value: '{{ .Values.deployment.env.store.s3.bucket }}'
+          value: '{{ .Values.deployment.env.store.blobs.s3.bucket }}'
         - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_PREFIX
-          value: '{{.Values.deployment.env.store.s3.prefix}}'
-        - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_LOGS_BUCKET
-          value: '{{ .Values.deployment.env.store.s3.logs_bucket }}'
+          value: '{{.Values.deployment.env.store.blobs.s3.prefix}}'
         - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_TYPE
-          value: '{{.Values.deployment.env.store.type}}'
+          value: '{{.Values.deployment.env.store.blobs.type}}'
+        - name: TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_TYPE
+          value: '{{.Values.deployment.env.store.device_logs.file.directory}}'
+        - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_S3_BUCKET
+          value: '{{ .Values.deployment.env.store.device_logs.s3.bucket }}'
+        - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_S3_PREFIX
+          value: '{{.Values.deployment.env.store.device_logs.s3.prefix}}'
+        - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_TYPE
+          value: '{{.Values.deployment.env.store.device_logs.type}}'
         image: "{{ .Values.deployment.image }}"
         securityContext:
           {{- .Values.podSecurityContext | toYaml | nindent 10 }}
diff --git a/charts/tidepool/charts/blob/values.yaml b/charts/tidepool/charts/blob/values.yaml
index f368001f6..d5275065b 100644
--- a/charts/tidepool/charts/blob/values.yaml
+++ b/charts/tidepool/charts/blob/values.yaml
@@ -10,17 +10,28 @@ deployment:
   image: tidepool/platform-blob:master-latest
   env:
     store:
-      s3:
-        # -- S3 bucket where blob data is written
-        bucket: "data"
-        prefix: "blobs"
-        logs_bucket: "device_logs"
-      file:
-        prefix: "blobs"
-        # -- directory to use when storing blobs on file storage
-        directory: "_data/blobs" 
-      # -- if `s3`, store blob data in Amazon S3. If `file` store blob data in local files.
-      type: file
+      blobs:
+        s3:
+          # -- S3 bucket where blob data is written
+          bucket: "data"
+          prefix: "blobs"
+        file:
+          prefix: "blobs"
+          # -- directory to use when storing blobs on file storage
+          directory: "_data/blobs" 
+        # -- if `s3`, store blob data in Amazon S3. If `file` store blob data in local files.
+        type: file
+      device_logs:
+        s3:
+          # -- S3 bucket where device_logs blob data is written
+          bucket: "device_logs"
+          prefix: "blobs"
+        file:
+          prefix: "blobs"
+          # -- directory to use when storing device_logs on file storage
+          directory: "_data/device_logs" 
+        # -- if `s3`, store blob data in Amazon S3. If `file` store blob data in local files.
+        type: file
 serviceAccount:
   # -- whether to create a service account
   create: false

From 5b332222531db5b62f0485de9019bb3662d8e797 Mon Sep 17 00:00:00 2001
From: Jamie <jamie.h.bate@gmail.com>
Date: Wed, 8 Mar 2023 13:49:39 +1300
Subject: [PATCH 5/7] fix naming

---
 charts/tidepool/charts/blob/templates/1-deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/tidepool/charts/blob/templates/1-deployment.yaml b/charts/tidepool/charts/blob/templates/1-deployment.yaml
index 6dd749119..0f3e0dfc5 100644
--- a/charts/tidepool/charts/blob/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/blob/templates/1-deployment.yaml
@@ -64,7 +64,7 @@ spec:
           value: '{{.Values.deployment.env.store.blobs.s3.prefix}}'
         - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_TYPE
           value: '{{.Values.deployment.env.store.blobs.type}}'
-        - name: TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_TYPE
+        - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_FILE_DIRECTORY
           value: '{{.Values.deployment.env.store.device_logs.file.directory}}'
         - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_S3_BUCKET
           value: '{{ .Values.deployment.env.store.device_logs.s3.bucket }}'

From 76c0697a1b1546631c5009c73ef683754b95191c Mon Sep 17 00:00:00 2001
From: Jamie Bate <jamie.h.bate@gmail.com>
Date: Tue, 14 Mar 2023 14:45:09 +1300
Subject: [PATCH 6/7] updates for logs service endpoint config

---
 .env                                          |  8 +++----
 .../charts/blob/templates/1-deployment.yaml   | 24 +++++++++----------
 charts/tidepool/charts/blob/values.yaml       |  7 +++---
 docker-compose.yml                            | 13 ++++++----
 4 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/.env b/.env
index bb2b1c44a..775b0b7d5 100644
--- a/.env
+++ b/.env
@@ -78,10 +78,10 @@ TIDEPOOL_DOCKER_PLATFORM_BLOB_HOST=platform-blob
 TIDEPOOL_DOCKER_PLATFORM_BLOB_PORT_PREFIX=
 TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_SECRET=Service secret used for interservice requests with the blob service
 
-TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_STORE_TYPE=file
-TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_STORE_FILE_DIRECTORY=_data/blobs
-TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_BUCKET=
-TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_PREFIX=
+TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_TYPE=file
+TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_FILE_DIRECTORY=_data/blobs
+TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_S3_BUCKET=
+TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_S3_PREFIX=
 TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_TYPE=file
 TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_FILE_DIRECTORY=_data/device_logs
 TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_S3_BUCKET=
diff --git a/charts/tidepool/charts/blob/templates/1-deployment.yaml b/charts/tidepool/charts/blob/templates/1-deployment.yaml
index 0f3e0dfc5..d23078bda 100644
--- a/charts/tidepool/charts/blob/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/blob/templates/1-deployment.yaml
@@ -56,22 +56,22 @@ spec:
               key: ServiceAuth
         - name: TIDEPOOL_BLOB_SERVICE_SERVER_ADDRESS
           value: :{{.Values.global.ports.blob}}
-        - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_FILE_DIRECTORY
-          value: '{{.Values.deployment.env.store.blobs.file.directory}}'
-        - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_BUCKET
-          value: '{{ .Values.deployment.env.store.blobs.s3.bucket }}'
-        - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_PREFIX
-          value: '{{.Values.deployment.env.store.blobs.s3.prefix}}'
-        - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_TYPE
-          value: '{{.Values.deployment.env.store.blobs.type}}'
+        - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_FILE_DIRECTORY
+          value: '{{.Values.deployment.env.blobs.store.file.directory}}'
+        - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_S3_BUCKET
+          value: '{{ .Values.deployment.env.blobs.store.s3.bucket }}'
+        - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_S3_PREFIX
+          value: '{{.Values.deployment.env.blobs.store.s3.prefix}}'
+        - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_TYPE
+          value: '{{.Values.deployment.env.blobs.store.type}}'
         - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_FILE_DIRECTORY
-          value: '{{.Values.deployment.env.store.device_logs.file.directory}}'
+          value: '{{.Values.deployment.env.logs.store.file.directory}}'
         - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_S3_BUCKET
-          value: '{{ .Values.deployment.env.store.device_logs.s3.bucket }}'
+          value: '{{ .Values.deployment.env.logs.store.s3.bucket }}'
         - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_S3_PREFIX
-          value: '{{.Values.deployment.env.store.device_logs.s3.prefix}}'
+          value: '{{.Values.deployment.env.logs.store.s3.prefix}}'
         - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_TYPE
-          value: '{{.Values.deployment.env.store.device_logs.type}}'
+          value: '{{.Values.deployment.env.logs.store.type}}'
         image: "{{ .Values.deployment.image }}"
         securityContext:
           {{- .Values.podSecurityContext | toYaml | nindent 10 }}
diff --git a/charts/tidepool/charts/blob/values.yaml b/charts/tidepool/charts/blob/values.yaml
index d5275065b..6ec40bdb4 100644
--- a/charts/tidepool/charts/blob/values.yaml
+++ b/charts/tidepool/charts/blob/values.yaml
@@ -9,8 +9,8 @@ deployment:
   # -- default Docker image
   image: tidepool/platform-blob:master-latest
   env:
-    store:
-      blobs:
+    blobs:
+      store:
         s3:
           # -- S3 bucket where blob data is written
           bucket: "data"
@@ -21,7 +21,8 @@ deployment:
           directory: "_data/blobs" 
         # -- if `s3`, store blob data in Amazon S3. If `file` store blob data in local files.
         type: file
-      device_logs:
+    logs:
+      store:
         s3:
           # -- S3 bucket where device_logs blob data is written
           bucket: "device_logs"
diff --git a/docker-compose.yml b/docker-compose.yml
index 2f7d4441a..6a0e8aff5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -271,11 +271,14 @@ services:
       TIDEPOOL_TASK_SERVICE_SERVER_ADDRESS: :${TIDEPOOL_DOCKER_PLATFORM_TASK_PORT_PREFIX}9224
       TIDEPOOL_USER_SERVICE_SERVER_ADDRESS: :${TIDEPOOL_DOCKER_PLATFORM_USER_PORT_PREFIX}9221
       TIDEPOOL_AUTH_SERVICE_DOMAIN: ${TIDEPOOL_DOCKER_API_HOST}
-      TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_TYPE: ${TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_STORE_TYPE}
-      TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_FILE_DIRECTORY: ${TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_STORE_FILE_DIRECTORY}
-      TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_BUCKET: ${TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_BUCKET}
-      TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_PREFIX: ${TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_PREFIX}
-      TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_LOGS_BUCKET_LOGS_BUCKET: ${TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_LOGS_BUCKET_LOGS_BUCKET}
+      TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_TYPE: ${TIDEPOOL_DOCKER_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_TYPE}
+      TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_FILE_DIRECTORY: ${TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_FILE_DIRECTORY}
+      TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_S3_BUCKET: ${TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_S3_BUCKET}
+      TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_S3_PREFIX: ${TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_S3_PREFIX}
+      TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_TYPE: ${TIDEPOOL_DOCKER_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_TYPE}
+      TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_FILE_DIRECTORY: ${TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_FILE_DIRECTORY}
+      TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_S3_BUCKET: ${TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_S3_BUCKET}
+      TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_S3_PREFIX: ${TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_S3_PREFIX}
       TIDEPOOL_IMAGE_SERVICE_UNSTRUCTURED_STORE_TYPE: ${TIDEPOOL_DOCKER_PLATFORM_IMAGE_SERVICE_UNSTRUCTURED_STORE_TYPE}
       TIDEPOOL_IMAGE_SERVICE_UNSTRUCTURED_STORE_FILE_DIRECTORY: ${TIDEPOOL_DOCKER_PLATFORM_IMAGE_SERVICE_UNSTRUCTURED_STORE_FILE_DIRECTORY}
       TIDEPOOL_IMAGE_SERVICE_UNSTRUCTURED_STORE_S3_BUCKET: ${TIDEPOOL_DOCKER_PLATFORM_IMAGE_SERVICE_UNSTRUCTURED_STORE_S3_BUCKET}

From b4f16776f74496563287764a37c5d2fb4196da77 Mon Sep 17 00:00:00 2001
From: Jamie <jamie.h.bate@gmail.com>
Date: Wed, 2 Aug 2023 10:21:00 +1200
Subject: [PATCH 7/7] change bucket name to be the same as blobs

use `device_logs` prefix
---
 charts/tidepool/charts/blob/values.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/tidepool/charts/blob/values.yaml b/charts/tidepool/charts/blob/values.yaml
index 6ec40bdb4..adf16e079 100644
--- a/charts/tidepool/charts/blob/values.yaml
+++ b/charts/tidepool/charts/blob/values.yaml
@@ -25,10 +25,10 @@ deployment:
       store:
         s3:
           # -- S3 bucket where device_logs blob data is written
-          bucket: "device_logs"
-          prefix: "blobs"
+          bucket: "data"
+          prefix: "device_logs"
         file:
-          prefix: "blobs"
+          prefix: "device_logs"
           # -- directory to use when storing device_logs on file storage
           directory: "_data/device_logs" 
         # -- if `s3`, store blob data in Amazon S3. If `file` store blob data in local files.