diff --git a/jobs/blobstore_benchmark/templates/storage_cli_config_buildpacks.json.erb b/jobs/blobstore_benchmark/templates/storage_cli_config_buildpacks.json.erb index 0d40baa04d..ce2fdd5ebd 100644 --- a/jobs/blobstore_benchmark/templates/storage_cli_config_buildpacks.json.erb +++ b/jobs/blobstore_benchmark/templates/storage_cli_config_buildpacks.json.erb @@ -35,9 +35,7 @@ if provider == "azurebs" options = cli_cfg_with_default_timeout(options, 'storage_cli') end -# Support both native storage-cli types (gcs) AND legacy fog names (Google) -# Legacy fog name support to be REMOVED May 2026 -if provider == "Google" || provider == "gcs" +if provider == "gcs" options["provider"] = provider options["credentials_source"] = "static" options["json_key"] = l.p("#{scope}.google_json_key_string") diff --git a/jobs/blobstore_benchmark/templates/storage_cli_config_droplets.json.erb b/jobs/blobstore_benchmark/templates/storage_cli_config_droplets.json.erb index e97c0be8a5..5ee6a0e503 100644 --- a/jobs/blobstore_benchmark/templates/storage_cli_config_droplets.json.erb +++ b/jobs/blobstore_benchmark/templates/storage_cli_config_droplets.json.erb @@ -35,9 +35,7 @@ if provider == "azurebs" options = cli_cfg_with_default_timeout(options, 'storage_cli') end -# Support both native storage-cli types (gcs) AND legacy fog names (Google) -# Legacy fog name support to be REMOVED May 2026 -if provider == "Google" || provider == "gcs" +if provider == "gcs" options["provider"] = provider options["credentials_source"] = "static" options["json_key"] = l.p("#{scope}.google_json_key_string") diff --git a/jobs/blobstore_benchmark/templates/storage_cli_config_packages.json.erb b/jobs/blobstore_benchmark/templates/storage_cli_config_packages.json.erb index 0cfb76b200..03d387be44 100644 --- a/jobs/blobstore_benchmark/templates/storage_cli_config_packages.json.erb +++ b/jobs/blobstore_benchmark/templates/storage_cli_config_packages.json.erb @@ -35,9 +35,7 @@ if provider == "azurebs" options = cli_cfg_with_default_timeout(options, 'storage_cli') end -# Support both native storage-cli types (gcs) AND legacy fog names (Google) -# Legacy fog name support to be REMOVED May 2026 -if provider == "Google" || provider == "gcs" +if provider == "gcs" options["provider"] = provider options["credentials_source"] = "static" options["json_key"] = l.p("#{scope}.google_json_key_string") diff --git a/jobs/blobstore_benchmark/templates/storage_cli_config_resource_pool.json.erb b/jobs/blobstore_benchmark/templates/storage_cli_config_resource_pool.json.erb index c2144dcd9e..11bb42ca34 100644 --- a/jobs/blobstore_benchmark/templates/storage_cli_config_resource_pool.json.erb +++ b/jobs/blobstore_benchmark/templates/storage_cli_config_resource_pool.json.erb @@ -35,9 +35,7 @@ if provider == "azurebs" options = cli_cfg_with_default_timeout(options, 'storage_cli') end -# Support both native storage-cli types (gcs) AND legacy fog names (Google) -# Legacy fog name support to be REMOVED May 2026 -if provider == "Google" || provider == "gcs" +if provider == "gcs" options["provider"] = provider options["credentials_source"] = "static" options["json_key"] = l.p("#{scope}.google_json_key_string") diff --git a/jobs/cc_deployment_updater/templates/storage_cli_config_buildpacks.json.erb b/jobs/cc_deployment_updater/templates/storage_cli_config_buildpacks.json.erb index 641c50fcc1..98b6307e78 100644 --- a/jobs/cc_deployment_updater/templates/storage_cli_config_buildpacks.json.erb +++ b/jobs/cc_deployment_updater/templates/storage_cli_config_buildpacks.json.erb @@ -35,9 +35,7 @@ if provider == "azurebs" options = cli_cfg_with_default_timeout(options, 'storage_cli') end -# Support both native storage-cli types (gcs) AND legacy fog names (Google) -# Legacy fog name support to be REMOVED May 2026 -if provider == "Google" || provider == "gcs" +if provider == "gcs" options["provider"] = provider options["credentials_source"] = "static" options["json_key"] = l.p("#{scope}.google_json_key_string") diff --git a/jobs/cc_deployment_updater/templates/storage_cli_config_droplets.json.erb b/jobs/cc_deployment_updater/templates/storage_cli_config_droplets.json.erb index 72ec34ba59..36560b01d7 100644 --- a/jobs/cc_deployment_updater/templates/storage_cli_config_droplets.json.erb +++ b/jobs/cc_deployment_updater/templates/storage_cli_config_droplets.json.erb @@ -35,9 +35,7 @@ if provider == "azurebs" options = cli_cfg_with_default_timeout(options, 'storage_cli') end -# Support both native storage-cli types (gcs) AND legacy fog names (Google) -# Legacy fog name support to be REMOVED May 2026 -if provider == "Google" || provider == "gcs" +if provider == "gcs" options["provider"] = provider options["credentials_source"] = "static" options["json_key"] = l.p("#{scope}.google_json_key_string") diff --git a/jobs/cc_deployment_updater/templates/storage_cli_config_packages.json.erb b/jobs/cc_deployment_updater/templates/storage_cli_config_packages.json.erb index 0cfb76b200..03d387be44 100644 --- a/jobs/cc_deployment_updater/templates/storage_cli_config_packages.json.erb +++ b/jobs/cc_deployment_updater/templates/storage_cli_config_packages.json.erb @@ -35,9 +35,7 @@ if provider == "azurebs" options = cli_cfg_with_default_timeout(options, 'storage_cli') end -# Support both native storage-cli types (gcs) AND legacy fog names (Google) -# Legacy fog name support to be REMOVED May 2026 -if provider == "Google" || provider == "gcs" +if provider == "gcs" options["provider"] = provider options["credentials_source"] = "static" options["json_key"] = l.p("#{scope}.google_json_key_string") diff --git a/jobs/cc_deployment_updater/templates/storage_cli_config_resource_pool.json.erb b/jobs/cc_deployment_updater/templates/storage_cli_config_resource_pool.json.erb index 099144db54..530e8a4fbe 100644 --- a/jobs/cc_deployment_updater/templates/storage_cli_config_resource_pool.json.erb +++ b/jobs/cc_deployment_updater/templates/storage_cli_config_resource_pool.json.erb @@ -35,9 +35,7 @@ if provider == "azurebs" options = cli_cfg_with_default_timeout(options, 'storage_cli') end -# Support both native storage-cli types (gcs) AND legacy fog names (Google) -# Legacy fog name support to be REMOVED May 2026 -if provider == "Google" || provider == "gcs" +if provider == "gcs" options["provider"] = provider options["credentials_source"] = "static" options["json_key"] = l.p("#{scope}.google_json_key_string") diff --git a/jobs/cloud_controller_clock/spec b/jobs/cloud_controller_clock/spec index e9a9e8cfe4..b26b5cc1fb 100644 --- a/jobs/cloud_controller_clock/spec +++ b/jobs/cloud_controller_clock/spec @@ -193,7 +193,7 @@ properties: description: "Storage Cli extra flags string" cc.resource_pool.blobstore_provider: - description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs', 'dav'] (native) or ['AWS', 'Google'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead." + description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs', 'dav'] (native) or ['AWS'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead." default: ~ cc.resource_pool.connection_config: description: "Storage CLI connection configuration" @@ -244,7 +244,7 @@ properties: default: "" cc.packages.blobstore_provider: - description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs', 'dav'] (native) or ['AWS', 'Google'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead." + description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs', 'dav'] (native) or ['AWS'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead." default: ~ cc.packages.connection_config: description: "Storage CLI connection configuration" @@ -292,7 +292,7 @@ properties: default: "" cc.droplets.blobstore_provider: - description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs', 'dav'] (native) or ['AWS', 'Google'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead." + description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs', 'dav'] (native) or ['AWS'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead." default: ~ cc.droplets.connection_config: description: "Storage CLI connection configuration" @@ -337,7 +337,7 @@ properties: default: "" cc.buildpacks.blobstore_provider: - description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs', 'dav'] (native) or ['AWS', 'Google'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead." + description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs', 'dav'] (native) or ['AWS'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead." default: ~ cc.buildpacks.connection_config: description: "Storage CLI connection configuration" diff --git a/jobs/cloud_controller_clock/templates/storage_cli_config_buildpacks.json.erb b/jobs/cloud_controller_clock/templates/storage_cli_config_buildpacks.json.erb index 2f4dc06fd8..cb321c35f1 100644 --- a/jobs/cloud_controller_clock/templates/storage_cli_config_buildpacks.json.erb +++ b/jobs/cloud_controller_clock/templates/storage_cli_config_buildpacks.json.erb @@ -33,9 +33,7 @@ if provider == "azurebs" options = cli_cfg_with_default_timeout(options, 'storage_cli') end -# Support both native storage-cli types (gcs) AND legacy fog names (Google) -# Legacy fog name support to be REMOVED May 2026 -if provider == "Google" || provider == "gcs" +if provider == "gcs" options["provider"] = provider options["credentials_source"] = "static" options["json_key"] = p("#{scope}.google_json_key_string") diff --git a/jobs/cloud_controller_clock/templates/storage_cli_config_droplets.json.erb b/jobs/cloud_controller_clock/templates/storage_cli_config_droplets.json.erb index f7d6257284..074ff61c2f 100644 --- a/jobs/cloud_controller_clock/templates/storage_cli_config_droplets.json.erb +++ b/jobs/cloud_controller_clock/templates/storage_cli_config_droplets.json.erb @@ -33,9 +33,7 @@ if provider == "azurebs" options = cli_cfg_with_default_timeout(options, 'storage_cli') end -# Support both native storage-cli types (gcs) AND legacy fog names (Google) -# Legacy fog name support to be REMOVED May 2026 -if provider == "Google" || provider == "gcs" +if provider == "gcs" options["provider"] = provider options["credentials_source"] = "static" options["json_key"] = p("#{scope}.google_json_key_string") diff --git a/jobs/cloud_controller_clock/templates/storage_cli_config_packages.json.erb b/jobs/cloud_controller_clock/templates/storage_cli_config_packages.json.erb index c647b4cc06..1556e3f611 100644 --- a/jobs/cloud_controller_clock/templates/storage_cli_config_packages.json.erb +++ b/jobs/cloud_controller_clock/templates/storage_cli_config_packages.json.erb @@ -33,9 +33,7 @@ if provider == "azurebs" options = cli_cfg_with_default_timeout(options, 'storage_cli') end -# Support both native storage-cli types (gcs) AND legacy fog names (Google) -# Legacy fog name support to be REMOVED May 2026 -if provider == "Google" || provider == "gcs" +if provider == "gcs" options["provider"] = provider options["credentials_source"] = "static" options["json_key"] = p("#{scope}.google_json_key_string") diff --git a/jobs/cloud_controller_clock/templates/storage_cli_config_resource_pool.json.erb b/jobs/cloud_controller_clock/templates/storage_cli_config_resource_pool.json.erb index ccfcea1d49..53848d75c3 100644 --- a/jobs/cloud_controller_clock/templates/storage_cli_config_resource_pool.json.erb +++ b/jobs/cloud_controller_clock/templates/storage_cli_config_resource_pool.json.erb @@ -33,9 +33,7 @@ if provider == "azurebs" options = cli_cfg_with_default_timeout(options, 'storage_cli') end -# Support both native storage-cli types (gcs) AND legacy fog names (Google) -# Legacy fog name support to be REMOVED May 2026 -if provider == "Google" || provider == "gcs" +if provider == "gcs" options["provider"] = provider options["credentials_source"] = "static" options["json_key"] = p("#{scope}.google_json_key_string") diff --git a/jobs/cloud_controller_ng/spec b/jobs/cloud_controller_ng/spec index 05ac331b02..3bbbe54954 100644 --- a/jobs/cloud_controller_ng/spec +++ b/jobs/cloud_controller_ng/spec @@ -532,7 +532,7 @@ properties: description: "Storage Cli extra flags string" cc.resource_pool.blobstore_provider: - description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs', 'dav'] (native) or ['AWS', 'Google'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead." + description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs', 'dav'] (native) or ['AWS'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead." default: ~ cc.resource_pool.connection_config: description: "Storage CLI connection configuration" @@ -585,7 +585,7 @@ properties: default: "" cc.packages.blobstore_provider: - description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs', 'dav'] (native) or ['AWS', 'Google'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead." + description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs', 'dav'] (native) or ['AWS'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead." default: ~ cc.packages.connection_config: description: "Storage CLI connection configuration" @@ -638,7 +638,7 @@ properties: default: "" cc.droplets.blobstore_provider: - description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs', 'dav'] (native) or ['AWS', 'Google'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead." + description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs', 'dav'] (native) or ['AWS'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead." default: ~ cc.droplets.connection_config: description: "Storage CLI connection configuration" @@ -688,7 +688,7 @@ properties: default: "" cc.buildpacks.blobstore_provider: - description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs', 'dav'] (native) or ['AWS', 'Google'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead." + description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs', 'dav'] (native) or ['AWS'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead." default: ~ cc.buildpacks.connection_config: description: "Storage CLI connection configuration" diff --git a/jobs/cloud_controller_ng/templates/storage_cli_config_buildpacks.json.erb b/jobs/cloud_controller_ng/templates/storage_cli_config_buildpacks.json.erb index 2f4dc06fd8..cb321c35f1 100644 --- a/jobs/cloud_controller_ng/templates/storage_cli_config_buildpacks.json.erb +++ b/jobs/cloud_controller_ng/templates/storage_cli_config_buildpacks.json.erb @@ -33,9 +33,7 @@ if provider == "azurebs" options = cli_cfg_with_default_timeout(options, 'storage_cli') end -# Support both native storage-cli types (gcs) AND legacy fog names (Google) -# Legacy fog name support to be REMOVED May 2026 -if provider == "Google" || provider == "gcs" +if provider == "gcs" options["provider"] = provider options["credentials_source"] = "static" options["json_key"] = p("#{scope}.google_json_key_string") diff --git a/jobs/cloud_controller_ng/templates/storage_cli_config_droplets.json.erb b/jobs/cloud_controller_ng/templates/storage_cli_config_droplets.json.erb index f7d6257284..074ff61c2f 100644 --- a/jobs/cloud_controller_ng/templates/storage_cli_config_droplets.json.erb +++ b/jobs/cloud_controller_ng/templates/storage_cli_config_droplets.json.erb @@ -33,9 +33,7 @@ if provider == "azurebs" options = cli_cfg_with_default_timeout(options, 'storage_cli') end -# Support both native storage-cli types (gcs) AND legacy fog names (Google) -# Legacy fog name support to be REMOVED May 2026 -if provider == "Google" || provider == "gcs" +if provider == "gcs" options["provider"] = provider options["credentials_source"] = "static" options["json_key"] = p("#{scope}.google_json_key_string") diff --git a/jobs/cloud_controller_ng/templates/storage_cli_config_packages.json.erb b/jobs/cloud_controller_ng/templates/storage_cli_config_packages.json.erb index c647b4cc06..1556e3f611 100644 --- a/jobs/cloud_controller_ng/templates/storage_cli_config_packages.json.erb +++ b/jobs/cloud_controller_ng/templates/storage_cli_config_packages.json.erb @@ -33,9 +33,7 @@ if provider == "azurebs" options = cli_cfg_with_default_timeout(options, 'storage_cli') end -# Support both native storage-cli types (gcs) AND legacy fog names (Google) -# Legacy fog name support to be REMOVED May 2026 -if provider == "Google" || provider == "gcs" +if provider == "gcs" options["provider"] = provider options["credentials_source"] = "static" options["json_key"] = p("#{scope}.google_json_key_string") diff --git a/jobs/cloud_controller_ng/templates/storage_cli_config_resource_pool.json.erb b/jobs/cloud_controller_ng/templates/storage_cli_config_resource_pool.json.erb index ccfcea1d49..53848d75c3 100644 --- a/jobs/cloud_controller_ng/templates/storage_cli_config_resource_pool.json.erb +++ b/jobs/cloud_controller_ng/templates/storage_cli_config_resource_pool.json.erb @@ -33,9 +33,7 @@ if provider == "azurebs" options = cli_cfg_with_default_timeout(options, 'storage_cli') end -# Support both native storage-cli types (gcs) AND legacy fog names (Google) -# Legacy fog name support to be REMOVED May 2026 -if provider == "Google" || provider == "gcs" +if provider == "gcs" options["provider"] = provider options["credentials_source"] = "static" options["json_key"] = p("#{scope}.google_json_key_string") diff --git a/jobs/cloud_controller_worker/spec b/jobs/cloud_controller_worker/spec index fca252d066..56d62a4756 100644 --- a/jobs/cloud_controller_worker/spec +++ b/jobs/cloud_controller_worker/spec @@ -150,7 +150,7 @@ properties: description: "Storage Cli extra flags string" cc.resource_pool.blobstore_provider: - description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs', 'dav'] (native) or ['AWS', 'Google'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead." + description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs', 'dav'] (native) or ['AWS'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead." default: ~ cc.resource_pool.connection_config: description: "Storage CLI connection configuration" @@ -201,7 +201,7 @@ properties: default: "" cc.packages.blobstore_provider: - description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs', 'dav'] (native) or ['AWS', 'Google'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead." + description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs', 'dav'] (native) or ['AWS'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead." default: ~ cc.packages.connection_config: description: "Storage CLI connection configuration" @@ -249,7 +249,7 @@ properties: default: "" cc.droplets.blobstore_provider: - description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs', 'dav'] (native) or ['AWS', 'Google'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead." + description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs', 'dav'] (native) or ['AWS'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead." default: ~ cc.droplets.connection_config: description: "Storage CLI connection configuration" @@ -294,7 +294,7 @@ properties: default: "" cc.buildpacks.blobstore_provider: - description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs', 'dav'] (native) or ['AWS', 'Google'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead." + description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs', 'dav'] (native) or ['AWS'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead." default: ~ cc.buildpacks.connection_config: description: "Storage CLI connection configuration" diff --git a/jobs/cloud_controller_worker/templates/storage_cli_config_buildpacks.json.erb b/jobs/cloud_controller_worker/templates/storage_cli_config_buildpacks.json.erb index 2f4dc06fd8..cb321c35f1 100644 --- a/jobs/cloud_controller_worker/templates/storage_cli_config_buildpacks.json.erb +++ b/jobs/cloud_controller_worker/templates/storage_cli_config_buildpacks.json.erb @@ -33,9 +33,7 @@ if provider == "azurebs" options = cli_cfg_with_default_timeout(options, 'storage_cli') end -# Support both native storage-cli types (gcs) AND legacy fog names (Google) -# Legacy fog name support to be REMOVED May 2026 -if provider == "Google" || provider == "gcs" +if provider == "gcs" options["provider"] = provider options["credentials_source"] = "static" options["json_key"] = p("#{scope}.google_json_key_string") diff --git a/jobs/cloud_controller_worker/templates/storage_cli_config_droplets.json.erb b/jobs/cloud_controller_worker/templates/storage_cli_config_droplets.json.erb index f7d6257284..074ff61c2f 100644 --- a/jobs/cloud_controller_worker/templates/storage_cli_config_droplets.json.erb +++ b/jobs/cloud_controller_worker/templates/storage_cli_config_droplets.json.erb @@ -33,9 +33,7 @@ if provider == "azurebs" options = cli_cfg_with_default_timeout(options, 'storage_cli') end -# Support both native storage-cli types (gcs) AND legacy fog names (Google) -# Legacy fog name support to be REMOVED May 2026 -if provider == "Google" || provider == "gcs" +if provider == "gcs" options["provider"] = provider options["credentials_source"] = "static" options["json_key"] = p("#{scope}.google_json_key_string") diff --git a/jobs/cloud_controller_worker/templates/storage_cli_config_packages.json.erb b/jobs/cloud_controller_worker/templates/storage_cli_config_packages.json.erb index c6a846b32c..ff31624adc 100644 --- a/jobs/cloud_controller_worker/templates/storage_cli_config_packages.json.erb +++ b/jobs/cloud_controller_worker/templates/storage_cli_config_packages.json.erb @@ -33,9 +33,7 @@ if provider == "azurebs" options = cli_cfg_with_default_timeout(options, 'storage_cli') end -# Support both native storage-cli types (gcs) AND legacy fog names (Google) -# Legacy fog name support to be REMOVED May 2026 -if provider == "Google" || provider == "gcs" +if provider == "gcs" options["provider"] = provider options["credentials_source"] = "static" options["json_key"] = p("#{scope}.google_json_key_string") diff --git a/jobs/cloud_controller_worker/templates/storage_cli_config_resource_pool.json.erb b/jobs/cloud_controller_worker/templates/storage_cli_config_resource_pool.json.erb index a0d7092e59..9a54138528 100644 --- a/jobs/cloud_controller_worker/templates/storage_cli_config_resource_pool.json.erb +++ b/jobs/cloud_controller_worker/templates/storage_cli_config_resource_pool.json.erb @@ -33,9 +33,7 @@ if provider == "azurebs" options = cli_cfg_with_default_timeout(options, 'storage_cli') end -# Support both native storage-cli types (gcs) AND legacy fog names (Google) -# Legacy fog name support to be REMOVED May 2026 -if provider == "Google" || provider == "gcs" +if provider == "gcs" options["provider"] = provider options["credentials_source"] = "static" options["json_key"] = p("#{scope}.google_json_key_string") diff --git a/spec/cc_deployment_updater/storage_cli_config_jsons_spec.rb b/spec/cc_deployment_updater/storage_cli_config_jsons_spec.rb index 82ded9d390..cb9d28761c 100644 --- a/spec/cc_deployment_updater/storage_cli_config_jsons_spec.rb +++ b/spec/cc_deployment_updater/storage_cli_config_jsons_spec.rb @@ -222,7 +222,7 @@ def props_for_provider(provider) end describe 'when provider is Google' do - let(:link_props) { props_for_provider('Google') } + let(:link_props) { props_for_provider('gcs') } let(:cc_link) do Bosh::Template::Test::Link.new( name: 'cloud_controller_internal', @@ -238,13 +238,13 @@ def props_for_provider(provider) it 'maps required properties into the rendered config' do set(link_props, keypath, { - 'provider' => 'Google', + 'provider' => 'gcs', 'bucket_name' => 'bucket', 'google_json_key_string' => '{}' }) json = YAML.safe_load(template.render(props, consumes: links)) expect(json).to include( - 'provider' => 'Google', + 'provider' => 'gcs', 'bucket_name' => 'bucket', 'json_key' => '{}', 'credentials_source' => 'static' @@ -253,7 +253,7 @@ def props_for_provider(provider) it 'includes optional properties when provided' do set(link_props, keypath, { - 'provider' => 'Google', + 'provider' => 'gcs', 'bucket_name' => 'bucket', 'google_json_key_string' => '{}', 'storage_class' => 'STANDARD', @@ -263,7 +263,7 @@ def props_for_provider(provider) json = YAML.safe_load(template.render(props, consumes: links)) expect(json).to include( - 'provider' => 'Google', + 'provider' => 'gcs', 'bucket_name' => 'bucket', 'json_key' => '{}', 'credentials_source' => 'static', diff --git a/spec/cloud_controller_clock/storage_cli_config_jsons_spec.rb b/spec/cloud_controller_clock/storage_cli_config_jsons_spec.rb index 1f97d4f1ab..f5972a087f 100644 --- a/spec/cloud_controller_clock/storage_cli_config_jsons_spec.rb +++ b/spec/cloud_controller_clock/storage_cli_config_jsons_spec.rb @@ -199,7 +199,7 @@ def props_for_provider(provider) end describe 'when provider is Google' do - let(:props) { props_for_provider('Google') } + let(:props) { props_for_provider('gcs') } storage_cli_templates.each do |(template_path, keypath)| describe template_path do @@ -207,13 +207,13 @@ def props_for_provider(provider) it 'maps required properties into the rendered config' do set(props, keypath, { - 'provider' => 'Google', + 'provider' => 'gcs', 'bucket_name' => 'bucket', 'google_json_key_string' => '{}' }) json = YAML.safe_load(template.render(props, consumes: links)) expect(json).to include( - 'provider' => 'Google', + 'provider' => 'gcs', 'bucket_name' => 'bucket', 'json_key' => '{}', 'credentials_source' => 'static' @@ -222,7 +222,7 @@ def props_for_provider(provider) it 'includes optional properties when provided' do set(props, keypath, { - 'provider' => 'Google', + 'provider' => 'gcs', 'bucket_name' => 'bucket', 'google_json_key_string' => '{}', 'storage_class' => 'STANDARD', @@ -232,7 +232,7 @@ def props_for_provider(provider) json = YAML.safe_load(template.render(props, consumes: links)) expect(json).to include( - 'provider' => 'Google', + 'provider' => 'gcs', 'bucket_name' => 'bucket', 'json_key' => '{}', 'credentials_source' => 'static', diff --git a/spec/cloud_controller_ng/bpm_spec.rb b/spec/cloud_controller_ng/bpm_spec.rb index e0fc475dcf..f3d9834f60 100644 --- a/spec/cloud_controller_ng/bpm_spec.rb +++ b/spec/cloud_controller_ng/bpm_spec.rb @@ -35,11 +35,8 @@ def valkey_volume_mounted?(process) let(:release) { ReleaseDir.new(release_path) } let(:job) { release.job('cloud_controller_ng') } - let(:properties_debug_gcp) do - { 'cc' => { 'log_fog_requests' => true, 'packages' => { 'fog_connection' => { 'provider' => 'Google' } } } } - end - let(:properties_debug_foo) do - { 'cc' => { 'log_fog_requests' => true, 'packages' => { 'fog_connection' => { 'provider' => 'foo' } } } } + let(:properties_debug_fog) do + { 'cc' => { 'log_fog_requests' => true, 'packages' => { 'fog_connection' => { 'provider' => 'AWS' } } } } end let(:properties_without_debug) do { 'cc' => { 'log_fog_requests' => false, 'packages' => { 'fog_connection' => { 'provider' => 'foo' } } } } @@ -49,16 +46,8 @@ def valkey_volume_mounted?(process) let(:template) { job.template('config/bpm.yml') } context 'when fog debug logging is enabled' do - it 'sets the DEBUG env var for GCP' do - template_hash = YAML.safe_load(template.render(properties_debug_gcp, consumes: {})) - - results = template_hash['processes'].select { |p| p['name'].include?('cloud_controller_ng') } - expect(results.length).to eq(1) - expect_default_debug_env_vars(results[0]['env']) - end - - it 'sets not any debug env var for Foo' do - template_hash = YAML.safe_load(template.render(properties_debug_foo, consumes: {})) + it 'sets the DEBUG env var' do + template_hash = YAML.safe_load(template.render(properties_debug_fog, consumes: {})) results = template_hash['processes'].select { |p| p['name'].include?('cloud_controller_ng') } expect(results.length).to eq(1) diff --git a/spec/cloud_controller_ng/storage_cli_config_jsons_spec.rb b/spec/cloud_controller_ng/storage_cli_config_jsons_spec.rb index f27644fba0..0429bfbf9a 100644 --- a/spec/cloud_controller_ng/storage_cli_config_jsons_spec.rb +++ b/spec/cloud_controller_ng/storage_cli_config_jsons_spec.rb @@ -199,7 +199,7 @@ def props_for_provider(provider) end describe 'when provider is Google' do - let(:props) { props_for_provider('Google') } + let(:props) { props_for_provider('gcs') } storage_cli_templates.each do |(template_path, keypath)| describe template_path do @@ -207,13 +207,13 @@ def props_for_provider(provider) it 'maps required properties into the rendered config' do set(props, keypath, { - 'provider' => 'Google', + 'provider' => 'gcs', 'bucket_name' => 'bucket', 'google_json_key_string' => '{}' }) json = YAML.safe_load(template.render(props, consumes: links)) expect(json).to include( - 'provider' => 'Google', + 'provider' => 'gcs', 'bucket_name' => 'bucket', 'json_key' => '{}', 'credentials_source' => 'static' @@ -222,7 +222,7 @@ def props_for_provider(provider) it 'includes optional properties when provided' do set(props, keypath, { - 'provider' => 'Google', + 'provider' => 'gcs', 'bucket_name' => 'bucket', 'google_json_key_string' => '{}', 'storage_class' => 'STANDARD', @@ -232,7 +232,7 @@ def props_for_provider(provider) json = YAML.safe_load(template.render(props, consumes: links)) expect(json).to include( - 'provider' => 'Google', + 'provider' => 'gcs', 'bucket_name' => 'bucket', 'json_key' => '{}', 'credentials_source' => 'static', diff --git a/spec/cloud_controller_worker/storage_cli_config_jsons_spec.rb b/spec/cloud_controller_worker/storage_cli_config_jsons_spec.rb index 2a14e593f4..7347cc3357 100644 --- a/spec/cloud_controller_worker/storage_cli_config_jsons_spec.rb +++ b/spec/cloud_controller_worker/storage_cli_config_jsons_spec.rb @@ -199,7 +199,7 @@ def props_for_provider(provider) end describe 'when provider is Google' do - let(:props) { props_for_provider('Google') } + let(:props) { props_for_provider('gcs') } storage_cli_templates.each do |(template_path, keypath)| describe template_path do @@ -207,13 +207,13 @@ def props_for_provider(provider) it 'maps required properties into the rendered config' do set(props, keypath, { - 'provider' => 'Google', + 'provider' => 'gcs', 'bucket_name' => 'bucket', 'google_json_key_string' => '{}' }) json = YAML.safe_load(template.render(props, consumes: links)) expect(json).to include( - 'provider' => 'Google', + 'provider' => 'gcs', 'bucket_name' => 'bucket', 'json_key' => '{}', 'credentials_source' => 'static' @@ -222,7 +222,7 @@ def props_for_provider(provider) it 'includes optional properties when provided' do set(props, keypath, { - 'provider' => 'Google', + 'provider' => 'gcs', 'bucket_name' => 'bucket', 'google_json_key_string' => '{}', 'storage_class' => 'STANDARD', @@ -232,7 +232,7 @@ def props_for_provider(provider) json = YAML.safe_load(template.render(props, consumes: links)) expect(json).to include( - 'provider' => 'Google', + 'provider' => 'gcs', 'bucket_name' => 'bucket', 'json_key' => '{}', 'credentials_source' => 'static',