Rename terraform var in projects

2i2c-org · Feb 28, 2024 · d703d8b · d703d8b
1 parent f8c23e0
commit d703d8b
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 19 deletions.
diff --git a/terraform/gcp/projects/awi-ciroh.tfvars b/terraform/gcp/projects/awi-ciroh.tfvars
@@ -63,12 +63,12 @@ dask_nodes = {
 
 hub_cloud_permissions = {
   "staging" : {
-    requestor_pays : false,
+    allow_access_to_external_requester_pays_buckets : false,
     bucket_admin_access : ["scratch-staging", "persistent-staging"],
     hub_namespace : "staging"
   },
   "prod" : {
-    requestor_pays : false,
+    allow_access_to_external_requester_pays_buckets : false,
     bucket_admin_access : ["scratch", "persistent"],
     hub_namespace : "prod"
   }

diff --git a/terraform/gcp/projects/daskhub-template.tfvars b/terraform/gcp/projects/daskhub-template.tfvars
@@ -33,7 +33,7 @@ user_buckets = {
 
 hub_cloud_permissions = {
   "{{ hub_name }}" : {
-    requestor_pays : true,
+    allow_access_to_external_requester_pays_buckets : true,
     bucket_admin_access : ["scratch-{{ hub_name }}"],
     hub_namespace : "{{ hub_name }}"
   },

diff --git a/terraform/gcp/projects/leap.tfvars b/terraform/gcp/projects/leap.tfvars
@@ -60,13 +60,13 @@ user_buckets = {
 
 hub_cloud_permissions = {
   "staging" : {
-    requestor_pays : true,
+    allow_access_to_external_requester_pays_buckets : true,
     bucket_admin_access : ["scratch-staging", "persistent-staging"],
     bucket_readonly_access : ["persistent-ro-staging"],
     hub_namespace : "staging"
   },
   "prod" : {
-    requestor_pays : true,
+    allow_access_to_external_requester_pays_buckets : true,
     bucket_admin_access : ["scratch", "persistent"],
     bucket_readonly_access : ["persistent-ro"],
     hub_namespace : "prod"

diff --git a/terraform/gcp/projects/linked-earth.tfvars b/terraform/gcp/projects/linked-earth.tfvars
@@ -61,12 +61,12 @@ dask_nodes = {
 
 hub_cloud_permissions = {
   "staging" : {
-    requestor_pays : false,
+    allow_access_to_external_requester_pays_buckets : false,
     bucket_admin_access : ["scratch-staging"],
     hub_namespace : "staging"
   },
   "prod" : {
-    requestor_pays : false,
+    allow_access_to_external_requester_pays_buckets : false,
     bucket_admin_access : ["scratch"],
     hub_namespace : "prod"
   }

diff --git a/terraform/gcp/projects/meom-ige.tfvars b/terraform/gcp/projects/meom-ige.tfvars
@@ -81,12 +81,12 @@ user_buckets = {
 
 hub_cloud_permissions = {
   "staging" : {
-    requestor_pays : true,
+    allow_access_to_external_requester_pays_buckets : true,
     bucket_admin_access : ["scratch", "data"],
     hub_namespace : "staging"
   },
   "prod" : {
-    requestor_pays : true,
+    allow_access_to_external_requester_pays_buckets : true,
     bucket_admin_access : ["scratch", "data"],
     hub_namespace : "prod"
   }

diff --git a/terraform/gcp/projects/pangeo-hubs.tfvars b/terraform/gcp/projects/pangeo-hubs.tfvars
@@ -109,17 +109,17 @@ dask_nodes = {
 
 hub_cloud_permissions = {
   "staging" : {
-    requestor_pays : true,
+    allow_access_to_external_requester_pays_buckets : true,
     bucket_admin_access : ["scratch-staging"],
     hub_namespace : "staging"
   },
   "prod" : {
-    requestor_pays : true,
+    allow_access_to_external_requester_pays_buckets : true,
     bucket_admin_access : ["scratch"],
     hub_namespace : "prod"
   },
   "coessing" : {
-    requestor_pays : true,
+    allow_access_to_external_requester_pays_buckets : true,
     bucket_admin_access : ["coessing-scratch"],
     hub_namespace : "coessing"
   },

diff --git a/terraform/gcp/projects/pilot-hubs.tfvars b/terraform/gcp/projects/pilot-hubs.tfvars
@@ -58,23 +58,23 @@ user_buckets = {
 
 hub_cloud_permissions = {
   "dask-staging" : {
-    requestor_pays : true,
+    allow_access_to_external_requester_pays_buckets : true,
     bucket_admin_access : [],
     hub_namespace : "dask-staging"
   },
   "ohw" : {
-    requestor_pays : true,
+    allow_access_to_external_requester_pays_buckets : true,
     bucket_admin_access : [],
     hub_namespace : "ohw"
   },
   # Can't use full name here as it violates line length restriction of service account id
   "catalyst-coop" : {
-    requestor_pays : true,
+    allow_access_to_external_requester_pays_buckets : true,
     bucket_admin_access : [],
     hub_namespace : "catalyst-cooperative"
   },
   "jackeddy" : {
-    requestor_pays : true,
+    allow_access_to_external_requester_pays_buckets : true,
     bucket_admin_access : ["jackeddy-scratch"],
     hub_namespace : "jackeddy"
   },

diff --git a/terraform/gcp/projects/qcl.tfvars b/terraform/gcp/projects/qcl.tfvars
@@ -66,12 +66,12 @@ notebook_nodes = {
 
 hub_cloud_permissions = {
   "staging" : {
-    requestor_pays : false,
+    allow_access_to_external_requester_pays_buckets : false,
     bucket_admin_access : ["scratch-staging"],
     hub_namespace : "staging"
   },
   "prod" : {
-    requestor_pays : false,
+    allow_access_to_external_requester_pays_buckets : false,
     bucket_admin_access : ["scratch"],
     hub_namespace : "prod"
   }

diff --git a/terraform/gcp/variables.tf b/terraform/gcp/variables.tf
@@ -416,7 +416,7 @@ variable "hub_cloud_permissions" {
 
   1. allow_access_to_external_requester_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
+     marked as 'Requester 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 GCS storage buckets that users on this hub should have read