From 5a6b8d546ebd38ec6252152ca5dd006be492fdc9 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Wed, 24 Jan 2024 10:43:48 -0500
Subject: [PATCH] fix(smoketest): re-add environment variables for presigned
 downloads secrets

---
 smoketest/compose/s3-cloudserver.yml | 2 ++
 smoketest/compose/s3-localstack.yml  | 2 ++
 smoketest/compose/s3-minio.yml       | 2 ++
 smoketest/compose/s3-seaweed.yml     | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/smoketest/compose/s3-cloudserver.yml b/smoketest/compose/s3-cloudserver.yml
index 232aca1dd..2abeb1039 100644
--- a/smoketest/compose/s3-cloudserver.yml
+++ b/smoketest/compose/s3-cloudserver.yml
@@ -10,6 +10,8 @@ services:
       QUARKUS_S3_AWS_CREDENTIALS_TYPE: static
       QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_ACCESS_KEY_ID: accessKey1
       QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_SECRET_ACCESS_KEY: verySecretKey1
+      AWS_ACCESS_KEY_ID: accessKey1
+      AWS_SECRET_ACCESS_KEY: verySecretKey1
   s3:
     image: ${CLOUDSERVER_IMAGE:-docker.io/zenko/cloudserver:latest}
     hostname: s3
diff --git a/smoketest/compose/s3-localstack.yml b/smoketest/compose/s3-localstack.yml
index a30d207a5..8945031b9 100644
--- a/smoketest/compose/s3-localstack.yml
+++ b/smoketest/compose/s3-localstack.yml
@@ -10,6 +10,8 @@ services:
       QUARKUS_S3_AWS_CREDENTIALS_TYPE: static
       QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_ACCESS_KEY_ID: unused
       QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_SECRET_ACCESS_KEY: unused
+      AWS_ACCESS_KEY_ID: unused
+      AWS_SECRET_ACCESS_KEY: unused
   s3:
     image: ${LOCALSTACK_IMAGE:-docker.io/localstack/localstack:latest}
     hostname: s3
diff --git a/smoketest/compose/s3-minio.yml b/smoketest/compose/s3-minio.yml
index 87d1ef081..2006e4a97 100644
--- a/smoketest/compose/s3-minio.yml
+++ b/smoketest/compose/s3-minio.yml
@@ -10,6 +10,8 @@ services:
       QUARKUS_S3_AWS_CREDENTIALS_TYPE: static
       QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_ACCESS_KEY_ID: minioroot
       QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_SECRET_ACCESS_KEY: minioroot
+      AWS_ACCESS_KEY_ID: minioroot
+      AWS_SECRET_ACCESS_KEY: minioroot
   s3:
     image: ${MINIO_IMAGE:-docker.io/minio/minio:latest}
     hostname: s3
diff --git a/smoketest/compose/s3-seaweed.yml b/smoketest/compose/s3-seaweed.yml
index da5c10283..03852be29 100644
--- a/smoketest/compose/s3-seaweed.yml
+++ b/smoketest/compose/s3-seaweed.yml
@@ -11,6 +11,8 @@ services:
       QUARKUS_S3_AWS_CREDENTIALS_TYPE: static
       QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_ACCESS_KEY_ID: access_key
       QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_SECRET_ACCESS_KEY: secret_key
+      AWS_ACCESS_KEY_ID: access_key
+      AWS_SECRET_ACCESS_KEY: secret_key
   s3:
     image: ${STORAGE_IMAGE:-quay.io/cryostat/cryostat-storage:latest}
     hostname: s3