From ba8e56a59243d9eaa304134cfcb60a1140ee5daa Mon Sep 17 00:00:00 2001
From: Elliot <elliot.charlton@portswigger.net>
Date: Wed, 24 Jul 2024 08:52:40 +0100
Subject: [PATCH] PLAT-453: Bump stegostore container version and template
 formatting

---
 .../templates/crossplane-aws-iam/policy.yaml              | 8 +++-----
 .../templates/stegostore/logical-backup.yaml              | 4 ++--
 charts/cloudnative-pg/values.yaml                         | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/charts/cloudnative-pg/templates/crossplane-aws-iam/policy.yaml b/charts/cloudnative-pg/templates/crossplane-aws-iam/policy.yaml
index 9e708dd..f92504e 100644
--- a/charts/cloudnative-pg/templates/crossplane-aws-iam/policy.yaml
+++ b/charts/cloudnative-pg/templates/crossplane-aws-iam/policy.yaml
@@ -22,8 +22,8 @@ spec:
             ],
             "Effect": "Allow",
             "Resource": [
-              "arn:aws:s3:::{{.Values.aws.resourcePrefix}}{{.Values.stackId}}"
-              "arn:aws:s3:::{{.Values.aws.resourcePrefix}}{{.Values.stackId}}/*"
+              "arn:aws:s3:::{{ .Values.aws.resourcePrefix }}{{ .Values.stackId }}",
+              "arn:aws:s3:::{{ .Values.aws.resourcePrefix }}{{ .Values.stackId }}/*"
               "arn:aws:s3:::{{.Values.aws.s3Backups.bucketName}}",
               "arn:aws:s3:::{{.Values.aws.s3Backups.bucketName}}/{{.Values.aws.resourcePrefix}}{{.Values.stackId}}/*"
             ]
@@ -39,9 +39,7 @@ spec:
             ],
             "Condition": {
               "ForAnyValue:StringLike": {
-                "kms:ResourceAliases": [
-                  "alias/{{ .Values.aws.resourcePrefix }}{{ .Values.stackId }}",
-                ]
+                "kms:ResourceAliases": "alias/{{ .Values.aws.resourcePrefix }}{{ .Values.stackId }}"
               }
             }
           }
diff --git a/charts/cloudnative-pg/templates/stegostore/logical-backup.yaml b/charts/cloudnative-pg/templates/stegostore/logical-backup.yaml
index 0d88410..79b63ed 100644
--- a/charts/cloudnative-pg/templates/stegostore/logical-backup.yaml
+++ b/charts/cloudnative-pg/templates/stegostore/logical-backup.yaml
@@ -53,9 +53,9 @@ spec:
                   name: postgres-app
                   key: port
             - name: S3PATH
-              value: "s3://{{.Values.aws.s3Backups.bucketName}}/{{.Values.aws.resourcePrefix}}{{.Values.stackId}}/stegostore/"
+              value: "s3://{{ .Values.aws.s3Backups.bucketName }}/{{ .Values.aws.resourcePrefix }}{{ .Values.stackId }}/stegostore/"
             - name: KMS_KEY_ALIAS_NAME
-              value: {{.Values.aws.resourcePrefix}}{{.Values.stackId}}
+              value: {{ .Values.aws.resourcePrefix }}{{ .Values.stackId }}
             - name: PGHOST
               value: "postgres-rw"
           restartPolicy: Never
diff --git a/charts/cloudnative-pg/values.yaml b/charts/cloudnative-pg/values.yaml
index e508829..3a4962d 100644
--- a/charts/cloudnative-pg/values.yaml
+++ b/charts/cloudnative-pg/values.yaml
@@ -47,7 +47,7 @@ stegostore:
   schedule: "0 * * * *"
   concurrencyPolicy: Forbid
   imageName: portswigger-cloud/stegostore
-  imageDigest: sha256:3e4771a813ed530a27b5ac6b009e6961a8bc67f9b9e1b386c09bbb60dd05211d
+  imageDigest: sha256:ab831be05edb2753e6106735ea23afa717ecb1f9c1e61ac847e1c95933309de2
 stegosweep:
   enabled: true
   schedule: "30 1 * * *"