Rename requester_pays again and rm it from aws

2i2c-org · Feb 27, 2024 · 90b9ec1 · 90b9ec1
1 parent 8cf8947
commit 90b9ec1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/terraform/aws/variables.tf b/terraform/aws/variables.tf
@@ -45,7 +45,6 @@ variable "user_buckets" {
 
 variable "hub_cloud_permissions" {
   type = map(object({
-    allow_access_to_requestor_pays_buckets : optional(bool, false),
     bucket_admin_access : set(string),
     extra_iam_policy : string
   }))
@@ -56,14 +55,9 @@ variable "hub_cloud_permissions" {
   Key is name of the hub namespace in the cluster, and values are particular
   permissions users running on those hubs should have. Currently supported are:
 
-  1. allow_access_to_requestor_pays_buckets: Allow code running in user servers from this
-     hub to identify as coming from this particular GCP project when accessing GCS buckets
-     marked as 'requestor_pays'. In this case, the egress costs will
-     be borne by the project *containing the hub*, rather than the project *containing the bucket*.
-     Egress costs can get quite expensive, so this is 'opt-in'.
-  2. bucket_admin_access: List of S3 storage buckets that users on this hub should have read
+  1. bucket_admin_access: List of S3 storage buckets that users on this hub should have read
      and write permissions for.
-  3. extra_iam_policy: An AWS IAM Policy document that grants additional rights to the users
+  2. extra_iam_policy: An AWS IAM Policy document that grants additional rights to the users
      on this hub when talking to AWS services.
   EOT
 }

diff --git a/terraform/gcp/variables.tf b/terraform/gcp/variables.tf
@@ -401,7 +401,7 @@ variable "max_cpu" {
 variable "hub_cloud_permissions" {
   type = map(
     object({
-      allow_access_to_requestor_pays_buckets : optional(bool, false),
+      allow_access_to_external_requestor_pays_buckets : optional(bool, false),
       bucket_admin_access : set(string),
       bucket_readonly_access : optional(set(string), []),
       hub_namespace : string
@@ -414,7 +414,7 @@ variable "hub_cloud_permissions" {
   Key is name of the hub namespace in the cluster, and values are particular
   permissions users running on those hubs should have. Currently supported are:
 
-  1. allow_access_to_requestor_pays_buckets: Allow code running in user servers from this
+  1. allow_access_to_external_requestor_pays_buckets: Allow code running in user servers from this
      hub to identify as coming from this particular GCP project when accessing GCS buckets
      marked as 'requestor_pays'. In this case, the egress costs will
      be borne by the project *containing the hub*, rather than the project *containing the bucket*.