Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
8 changes: 4 additions & 4 deletions jobs/cloud_controller_clock/spec
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
8 changes: 4 additions & 4 deletions jobs/cloud_controller_ng/spec
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
8 changes: 4 additions & 4 deletions jobs/cloud_controller_worker/spec
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
10 changes: 5 additions & 5 deletions spec/cc_deployment_updater/storage_cli_config_jsons_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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'
Expand All @@ -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',
Expand All @@ -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',
Expand Down
Loading