From add4e85c1b310266f39d2e40d8cba414ee6de876 Mon Sep 17 00:00:00 2001
From: Erik Sundell <erik.i.sundell@gmail.com>
Date: Sat, 20 Apr 2024 14:08:48 +0200
Subject: [PATCH] terraform, aws: rely on default value for extra_iam_policy

---
 terraform/aws/projects/2i2c-aws-us.tfvars            | 6 ------
 terraform/aws/projects/bican.tfvars                  | 2 --
 terraform/aws/projects/catalystproject-africa.tfvars | 2 --
 terraform/aws/projects/dandi.tfvars                  | 2 --
 terraform/aws/projects/earthscope.tfvars             | 2 --
 terraform/aws/projects/gridsst.tfvars                | 2 --
 terraform/aws/projects/jupyter-health.tfvars         | 2 --
 terraform/aws/projects/kitware.tfvars                | 2 --
 terraform/aws/projects/linc.tfvars                   | 2 --
 terraform/aws/projects/nasa-esdis.tfvars             | 1 -
 terraform/aws/projects/openscapes.tfvars             | 2 --
 terraform/aws/projects/smithsonian.tfvars            | 2 --
 terraform/aws/projects/template.tfvars               | 1 -
 terraform/aws/projects/ubc-eoas.tfvars               | 2 --
 terraform/aws/projects/victor.tfvars                 | 2 --
 15 files changed, 32 deletions(-)

diff --git a/terraform/aws/projects/2i2c-aws-us.tfvars b/terraform/aws/projects/2i2c-aws-us.tfvars
index d360c4a278..38c20188d6 100644
--- a/terraform/aws/projects/2i2c-aws-us.tfvars
+++ b/terraform/aws/projects/2i2c-aws-us.tfvars
@@ -33,13 +33,11 @@ hub_cloud_permissions = {
   "staging" : {
     "user-sa" : {
       bucket_admin_access : ["scratch-staging"],
-      extra_iam_policy : "",
     },
   },
   "dask-staging" : {
     "user-sa" : {
       bucket_admin_access : ["scratch-dask-staging"],
-      extra_iam_policy : "",
     },
   },
   "showcase" : {
@@ -48,25 +46,21 @@ hub_cloud_permissions = {
         "scratch-researchdelight",
         "persistent-showcase",
       ],
-      extra_iam_policy : "",
     },
   },
   "ncar-cisl" : {
     "user-sa" : {
       bucket_admin_access : ["scratch-ncar-cisl"],
-      extra_iam_policy : "",
     },
   },
   "go-bgc" : {
     "user-sa" : {
       bucket_admin_access : ["scratch-go-bgc"],
-      extra_iam_policy : "",
     },
   },
   "itcoocean" : {
     "user-sa" : {
       bucket_admin_access : ["scratch-itcoocean"],
-      extra_iam_policy : "",
     },
   },
 }
diff --git a/terraform/aws/projects/bican.tfvars b/terraform/aws/projects/bican.tfvars
index b4ec1f3a4e..5411d6f659 100644
--- a/terraform/aws/projects/bican.tfvars
+++ b/terraform/aws/projects/bican.tfvars
@@ -18,13 +18,11 @@ hub_cloud_permissions = {
   "staging" : {
     "user-sa" : {
       bucket_admin_access : ["scratch-staging"],
-      extra_iam_policy : "",
     },
   },
   "prod" : {
     "user-sa" : {
       bucket_admin_access : ["scratch"],
-      extra_iam_policy : "",
     },
   },
 }
diff --git a/terraform/aws/projects/catalystproject-africa.tfvars b/terraform/aws/projects/catalystproject-africa.tfvars
index 7dd5753aeb..daf6ec5bd2 100644
--- a/terraform/aws/projects/catalystproject-africa.tfvars
+++ b/terraform/aws/projects/catalystproject-africa.tfvars
@@ -18,13 +18,11 @@ hub_cloud_permissions = {
   "staging" : {
     "user-sa" : {
       bucket_admin_access : ["scratch-staging"],
-      extra_iam_policy : "",
     },
   },
   "prod" : {
     "user-sa" : {
       bucket_admin_access : ["scratch"],
-      extra_iam_policy : "",
     },
   },
 }
diff --git a/terraform/aws/projects/dandi.tfvars b/terraform/aws/projects/dandi.tfvars
index e33f0bd3a0..eb70b296b5 100644
--- a/terraform/aws/projects/dandi.tfvars
+++ b/terraform/aws/projects/dandi.tfvars
@@ -18,13 +18,11 @@ hub_cloud_permissions = {
   "staging" : {
     "user-sa" : {
       bucket_admin_access : ["scratch-staging"],
-      extra_iam_policy : "",
     },
   },
   "prod" : {
     "user-sa" : {
       bucket_admin_access : ["scratch"],
-      extra_iam_policy : "",
     },
   },
 }
diff --git a/terraform/aws/projects/earthscope.tfvars b/terraform/aws/projects/earthscope.tfvars
index ef80ccc156..0fecda7e47 100644
--- a/terraform/aws/projects/earthscope.tfvars
+++ b/terraform/aws/projects/earthscope.tfvars
@@ -18,13 +18,11 @@ hub_cloud_permissions = {
   "staging" : {
     "user-sa" : {
       bucket_admin_access : ["scratch-staging"],
-      extra_iam_policy : "",
     },
   },
   "prod" : {
     "user-sa" : {
       bucket_admin_access : ["scratch"],
-      extra_iam_policy : "",
     },
   },
 }
diff --git a/terraform/aws/projects/gridsst.tfvars b/terraform/aws/projects/gridsst.tfvars
index b995159683..7def9eecb5 100644
--- a/terraform/aws/projects/gridsst.tfvars
+++ b/terraform/aws/projects/gridsst.tfvars
@@ -18,13 +18,11 @@ hub_cloud_permissions = {
   "staging" : {
     "user-sa" : {
       bucket_admin_access : ["scratch-staging"],
-      extra_iam_policy : "",
     },
   },
   "prod" : {
     "user-sa" : {
       bucket_admin_access : ["scratch"],
-      extra_iam_policy : "",
     },
   },
 }
diff --git a/terraform/aws/projects/jupyter-health.tfvars b/terraform/aws/projects/jupyter-health.tfvars
index a273ce3b98..5af56b293f 100644
--- a/terraform/aws/projects/jupyter-health.tfvars
+++ b/terraform/aws/projects/jupyter-health.tfvars
@@ -18,13 +18,11 @@ hub_cloud_permissions = {
   "staging" : {
     "user-sa" : {
       bucket_admin_access : ["scratch-staging"],
-      extra_iam_policy : "",
     },
   },
   "prod" : {
     "user-sa" : {
       bucket_admin_access : ["scratch"],
-      extra_iam_policy : "",
     },
   },
 }
diff --git a/terraform/aws/projects/kitware.tfvars b/terraform/aws/projects/kitware.tfvars
index 54cc305028..4636b90ae6 100644
--- a/terraform/aws/projects/kitware.tfvars
+++ b/terraform/aws/projects/kitware.tfvars
@@ -17,13 +17,11 @@ hub_cloud_permissions = {
   "staging" : {
     "user-sa" : {
       bucket_admin_access : ["scratch-staging"],
-      extra_iam_policy : "",
     },
   },
   "prod" : {
     "user-sa" : {
       bucket_admin_access : ["scratch"],
-      extra_iam_policy : "",
     },
   },
 }
diff --git a/terraform/aws/projects/linc.tfvars b/terraform/aws/projects/linc.tfvars
index 0bd1caaa37..8b40a75889 100644
--- a/terraform/aws/projects/linc.tfvars
+++ b/terraform/aws/projects/linc.tfvars
@@ -18,13 +18,11 @@ hub_cloud_permissions = {
   "staging" : {
     "user-sa" : {
       bucket_admin_access : ["scratch-staging"],
-      extra_iam_policy : "",
     },
   },
   "prod" : {
     "user-sa" : {
       bucket_admin_access : ["scratch"],
-      extra_iam_policy : "",
     },
   },
 }
diff --git a/terraform/aws/projects/nasa-esdis.tfvars b/terraform/aws/projects/nasa-esdis.tfvars
index 803c412fa2..b371a6bdc6 100644
--- a/terraform/aws/projects/nasa-esdis.tfvars
+++ b/terraform/aws/projects/nasa-esdis.tfvars
@@ -18,7 +18,6 @@ hub_cloud_permissions = {
   "staging" : {
     "user-sa" : {
       bucket_admin_access : ["scratch-staging"],
-      extra_iam_policy : "",
     },
   },
   "prod" : {
diff --git a/terraform/aws/projects/openscapes.tfvars b/terraform/aws/projects/openscapes.tfvars
index a24be639c8..1bd7851e47 100644
--- a/terraform/aws/projects/openscapes.tfvars
+++ b/terraform/aws/projects/openscapes.tfvars
@@ -30,7 +30,6 @@ hub_cloud_permissions = {
         "scratch-staging",
         "persistent-staging",
       ],
-      extra_iam_policy : "",
     },
   },
   "prod" : {
@@ -39,7 +38,6 @@ hub_cloud_permissions = {
         "scratch",
         "persistent",
       ],
-      extra_iam_policy : "",
     }
   },
 }
diff --git a/terraform/aws/projects/smithsonian.tfvars b/terraform/aws/projects/smithsonian.tfvars
index 8bbf537938..28edc972f6 100644
--- a/terraform/aws/projects/smithsonian.tfvars
+++ b/terraform/aws/projects/smithsonian.tfvars
@@ -15,13 +15,11 @@ hub_cloud_permissions = {
   "staging" : {
     "user-sa" : {
       bucket_admin_access : ["scratch-staging"],
-      extra_iam_policy : "",
     },
   },
   "prod" : {
     "user-sa" : {
       bucket_admin_access : ["scratch"],
-      extra_iam_policy : "",
     },
   },
 }
diff --git a/terraform/aws/projects/template.tfvars b/terraform/aws/projects/template.tfvars
index 64a41ea476..afd0412f0c 100644
--- a/terraform/aws/projects/template.tfvars
+++ b/terraform/aws/projects/template.tfvars
@@ -27,7 +27,6 @@ cluster_nodes_location = "{{ cluster_region }}a"
 #  "{{ hub_name }}" : {
 #    "user-sa" : {
 #      bucket_admin_access : ["scratch-{{ hub_name }}"],
-#      extra_iam_policy : "",
 #    },
 #  },
 # # Tip: add more namespaces below, if this cluster will be multi-tenant
diff --git a/terraform/aws/projects/ubc-eoas.tfvars b/terraform/aws/projects/ubc-eoas.tfvars
index ecb02e5a43..98686f1f7f 100644
--- a/terraform/aws/projects/ubc-eoas.tfvars
+++ b/terraform/aws/projects/ubc-eoas.tfvars
@@ -18,13 +18,11 @@ hub_cloud_permissions = {
   "staging" : {
     "user-sa" : {
       bucket_admin_access : ["scratch-staging"],
-      extra_iam_policy : "",
     },
   },
   "prod" : {
     "user-sa" : {
       bucket_admin_access : ["scratch"],
-      extra_iam_policy : "",
     },
   },
 }
diff --git a/terraform/aws/projects/victor.tfvars b/terraform/aws/projects/victor.tfvars
index 1c22c00cca..7e61ad64a4 100644
--- a/terraform/aws/projects/victor.tfvars
+++ b/terraform/aws/projects/victor.tfvars
@@ -18,13 +18,11 @@ hub_cloud_permissions = {
   "staging" : {
     "user-sa" : {
       bucket_admin_access : ["scratch-staging"],
-      extra_iam_policy : "",
     },
   },
   "prod" : {
     "user-sa" : {
       bucket_admin_access : ["scratch"],
-      extra_iam_policy : "",
     },
   },
 }