From d703d8bdcc71a079542e9da87f4566055908b65b Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Wed, 28 Feb 2024 13:44:02 +0200 Subject: [PATCH] Rename terraform var in projects --- terraform/gcp/projects/awi-ciroh.tfvars | 4 ++-- terraform/gcp/projects/daskhub-template.tfvars | 2 +- terraform/gcp/projects/leap.tfvars | 4 ++-- terraform/gcp/projects/linked-earth.tfvars | 4 ++-- terraform/gcp/projects/meom-ige.tfvars | 4 ++-- terraform/gcp/projects/pangeo-hubs.tfvars | 6 +++--- terraform/gcp/projects/pilot-hubs.tfvars | 8 ++++---- terraform/gcp/projects/qcl.tfvars | 4 ++-- terraform/gcp/variables.tf | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/terraform/gcp/projects/awi-ciroh.tfvars b/terraform/gcp/projects/awi-ciroh.tfvars index 5a6a6ebe94..1a4cd55562 100644 --- 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 index 1bcf3e668a..76364e6ddd 100644 --- 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 index f2862cdb2e..4fca26bb32 100644 --- 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 index 4234fb37a8..86678d6f2f 100644 --- 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 index 3c25ebda9a..f76778880f 100644 --- 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 index 9277761bbd..ddcd8bd49b 100644 --- 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 index 620d8119a0..02d3769aac 100644 --- 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 index 1433331606..a39144325e 100644 --- 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 index f842bec480..0a514ed612 100644 --- 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