From 9348c98d97adc331bc8a538c2e6d4679915ad2ea Mon Sep 17 00:00:00 2001
From: Michael Li <michael.li@hashicorp.com>
Date: Thu, 25 Apr 2024 14:56:32 +0000
Subject: [PATCH 1/2] backport of commit
 fdd6e659129a028ec29c0f26f1a9c0378a9c6133

---
 enos/modules/docker_minio/policy.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/enos/modules/docker_minio/policy.json b/enos/modules/docker_minio/policy.json
index eb7c16241b..dab3d9c789 100644
--- a/enos/modules/docker_minio/policy.json
+++ b/enos/modules/docker_minio/policy.json
@@ -4,16 +4,26 @@
     {
       "Effect": "Allow",
       "Action": [
-        "s3:ListBucket",
         "s3:PutObject",
         "s3:GetObject",
         "s3:DeleteObject",
         "s3:GetObjectAttributes"
       ],
       "Resource": [
-        "arn:aws:s3:::testbucket",
         "arn:aws:s3:::testbucket/*"
       ]
+    },
+    {
+      "Action": "s3:ListBucket",
+      "Effect": "Allow",
+      "Resource": "arn:aws:s3:::testbucket"
+    },
+    {
+      "Action": [
+        "admin:CreateServiceAccount",
+        "admin:RemoveServiceAccount"
+      ],
+      "Effect": "Allow"
     }
   ]
 }

From f4bff79f3555f3eba985835234a9e11127f083df Mon Sep 17 00:00:00 2001
From: Michael Li <michael.li@hashicorp.com>
Date: Sat, 27 Apr 2024 00:54:50 +0000
Subject: [PATCH 2/2] backport of commit
 dfe6a9c9f07b0b952dfe14263ad0be0b0174d4e3

---
 enos/modules/docker_minio/main.tf           | 4 ++++
 enos/modules/test_e2e_docker/main.tf        | 6 ++++++
 enos/modules/test_e2e_docker/test_runner.sh | 1 +
 3 files changed, 11 insertions(+)

diff --git a/enos/modules/docker_minio/main.tf b/enos/modules/docker_minio/main.tf
index a3fadcda48..ef23d92c4b 100644
--- a/enos/modules/docker_minio/main.tf
+++ b/enos/modules/docker_minio/main.tf
@@ -174,6 +174,10 @@ output "bucket_region" {
   value = var.region
 }
 
+output "bucket_user_id" {
+  value = var.user_id
+}
+
 output "endpoint_url" {
   value = "http://${var.container_name}:9000"
 }
diff --git a/enos/modules/test_e2e_docker/main.tf b/enos/modules/test_e2e_docker/main.tf
index bc0f5ad455..be20e7fc82 100644
--- a/enos/modules/test_e2e_docker/main.tf
+++ b/enos/modules/test_e2e_docker/main.tf
@@ -134,6 +134,11 @@ variable "bucket_name" {
   type        = string
   default     = ""
 }
+variable "bucket_user_id" {
+  description = "User ID created in bucket"
+  type        = string
+  default     = ""
+}
 variable "minio_alias" {
   description = "Alias used in the minio cli"
   type        = string
@@ -261,6 +266,7 @@ resource "enos_local_exec" "run_e2e_test" {
     E2E_VAULT_ADDR                = local.vault_addr_internal
     E2E_BUCKET_NAME               = var.bucket_name
     E2E_BUCKET_ENDPOINT_URL       = var.bucket_endpoint_url
+    E2E_BUCKET_USER_ID            = var.bucket_user_id
     E2E_BUCKET_ACCESS_KEY_ID      = var.access_key_id
     E2E_BUCKET_SECRET_ACCESS_KEY  = var.secret_access_key
     E2E_MINIO_ALIAS               = var.minio_alias
diff --git a/enos/modules/test_e2e_docker/test_runner.sh b/enos/modules/test_e2e_docker/test_runner.sh
index 6d14168eaa..e4c1390c73 100644
--- a/enos/modules/test_e2e_docker/test_runner.sh
+++ b/enos/modules/test_e2e_docker/test_runner.sh
@@ -24,6 +24,7 @@ docker run \
     -e "E2E_SSH_KEY_PATH=/keys/target.pem" \
     -e "E2E_REGION=$E2E_REGION" \
     -e "E2E_BUCKET_NAME=$E2E_BUCKET_NAME" \
+    -e "E2E_BUCKET_USER_ID=$E2E_BUCKET_USER_ID" \
     -e "E2E_BUCKET_ENDPOINT_URL=$E2E_BUCKET_ENDPOINT_URL" \
     -e "E2E_BUCKET_ACCESS_KEY_ID=$E2E_BUCKET_ACCESS_KEY_ID" \
     -e "E2E_BUCKET_SECRET_ACCESS_KEY=$E2E_BUCKET_SECRET_ACCESS_KEY" \