From 98f5be53003a507362adc15bfa57790de7c95a71 Mon Sep 17 00:00:00 2001
From: RFN <37929910+nicosuter@users.noreply.github.com>
Date: Sat, 4 Apr 2026 19:04:54 +0200
Subject: [PATCH] allow mnt of s3 directories

---
 modules/aws/eks-addons/s3-csi.tf | 51 ++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 19 deletions(-)

diff --git a/modules/aws/eks-addons/s3-csi.tf b/modules/aws/eks-addons/s3-csi.tf
index f0dc17e..d6e1d1c 100644
--- a/modules/aws/eks-addons/s3-csi.tf
+++ b/modules/aws/eks-addons/s3-csi.tf
@@ -37,28 +37,41 @@ resource "aws_iam_role_policy" "s3_csi" {
 
   policy = jsonencode({
     Version = "2012-10-17"
-    Statement = [
-      {
-        Sid    = "ObjectAccess"
+    Statement = concat(
+      [
+        {
+          Sid    = "ObjectAccess"
+          Effect = "Allow"
+          Action = [
+            "s3:GetObject",
+            "s3:PutObject",
+            "s3:AbortMultipartUpload",
+            "s3:DeleteObject",
+          ]
+          Resource = [for arn in var.s3_bucket_arns : "${arn}/*"]
+        },
+        {
+          Sid    = "BucketAccess"
+          Effect = "Allow"
+          Action = [
+            "s3:ListBucket",
+            "s3:GetBucketLocation",
+          ]
+          Resource = var.s3_bucket_arns
+        },
+      ],
+      length(var.s3_bucket_kms_key_arns) > 0 ? [{
+        Sid    = "KmsAccess"
         Effect = "Allow"
         Action = [
-          "s3:GetObject",
-          "s3:PutObject",
-          "s3:AbortMultipartUpload",
-          "s3:DeleteObject",
+          "kms:Decrypt",
+          "kms:GenerateDataKey",
+          "kms:GenerateDataKeyWithoutPlaintext",
+          "kms:DescribeKey",
         ]
-        Resource = [for arn in var.s3_bucket_arns : "${arn}/*"]
-      },
-      {
-        Sid    = "BucketAccess"
-        Effect = "Allow"
-        Action = [
-          "s3:ListBucket",
-          "s3:GetBucketLocation",
-        ]
-        Resource = var.s3_bucket_arns
-      },
-    ]
+        Resource = var.s3_bucket_kms_key_arns
+      }] : []
+    )
   })
 }