Remove fog-google support from storage-cli templates and specs

Author: kathap

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")

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")

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")

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")

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")

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")

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")

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")

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"

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")