Skip to content
Open
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 @@ -25,9 +25,7 @@ scope = "cc.buildpacks.connection_config"
provider = l.p("cc.buildpacks.blobstore_provider", nil)
options = {}

# Support both native storage-cli types (azurebs) AND legacy fog names (AzureRM)
# Legacy fog name support to be REMOVED May 2026
if provider == "AzureRM" || provider == "azurebs"
if provider == "azurebs"
options["provider"] = provider
options["account_name"] = l.p("#{scope}.azure_storage_account_name")
options["container_name"] = l.p("#{scope}.container_name")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ scope = "cc.droplets.connection_config"
provider = l.p("cc.droplets.blobstore_provider", nil)
options = {}

# Support both native storage-cli types (azurebs) AND legacy fog names (AzureRM)
# Legacy fog name support to be REMOVED May 2026
if provider == "AzureRM" || provider == "azurebs"
if provider == "azurebs"
options["provider"] = provider
options["account_name"] = l.p("#{scope}.azure_storage_account_name")
options["container_name"] = l.p("#{scope}.container_name")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ scope = "cc.packages.connection_config"
provider = l.p("cc.packages.blobstore_provider", nil)
options = {}

# Support both native storage-cli types (azurebs) AND legacy fog names (AzureRM)
# Legacy fog name support to be REMOVED May 2026
if provider == "AzureRM" || provider == "azurebs"
if provider == "azurebs"
options["provider"] = provider
options["account_name"] = l.p("#{scope}.azure_storage_account_name")
options["container_name"] = l.p("#{scope}.container_name")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ scope = "cc.resource_pool.connection_config"
provider = l.p("cc.resource_pool.blobstore_provider", nil)
options = {}

# Support both native storage-cli types (azurebs) AND legacy fog names (AzureRM)
# Legacy fog name support to be REMOVED May 2026
if provider == "AzureRM" || provider == "azurebs"
if provider == "azurebs"
options["provider"] = provider
options["account_name"] = l.p("#{scope}.azure_storage_account_name")
options["container_name"] = l.p("#{scope}.container_name")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ scope = "cc.buildpacks.connection_config"
provider = l.p("cc.buildpacks.blobstore_provider", nil)
options = {}

# Support both native storage-cli types (azurebs) AND legacy fog names (AzureRM)
# Legacy fog name support to be REMOVED May 2026
if provider == "AzureRM" || provider == "azurebs"
if provider == "azurebs"
options["provider"] = provider
options["account_name"] = l.p("#{scope}.azure_storage_account_name")
options["container_name"] = l.p("#{scope}.container_name")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ scope = "cc.droplets.connection_config"
provider = l.p("cc.droplets.blobstore_provider", nil)
options = {}

# Support both native storage-cli types (azurebs) AND legacy fog names (AzureRM)
# Legacy fog name support to be REMOVED May 2026
if provider == "AzureRM" || provider == "azurebs"
if provider == "azurebs"
options["provider"] = provider
options["account_name"] = l.p("#{scope}.azure_storage_account_name")
options["container_name"] = l.p("#{scope}.container_name")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ scope = "cc.packages.connection_config"
provider = l.p("cc.packages.blobstore_provider", nil)
options = {}

# Support both native storage-cli types (azurebs) AND legacy fog names (AzureRM)
# Legacy fog name support to be REMOVED May 2026
if provider == "AzureRM" || provider == "azurebs"
if provider == "azurebs"
options["provider"] = provider
options["account_name"] = l.p("#{scope}.azure_storage_account_name")
options["container_name"] = l.p("#{scope}.container_name")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ scope = "cc.resource_pool.connection_config"
provider = l.p("cc.resource_pool.blobstore_provider", nil)
options = {}

# Support both native storage-cli types (azurebs) AND legacy fog names (AzureRM)
# Legacy fog name support to be REMOVED May 2026
if provider == "AzureRM" || provider == "azurebs"
if provider == "azurebs"
options["provider"] = provider
options["account_name"] = l.p("#{scope}.azure_storage_account_name")
options["container_name"] = l.p("#{scope}.container_name")
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 @@ -188,7 +188,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'] (native) or ['AzureRM', 'AWS', 'aliyun', 'Google'] (legacy, to be removed May 2026)"
description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs'] (native) or ['AWS', 'aliyun', 'Google'] (legacy, to be removed May 2026)"
default: ~
cc.resource_pool.connection_config:
description: "Azure Storage Cli connection hash"
Expand Down Expand Up @@ -239,7 +239,7 @@ properties:
default: ""

cc.packages.blobstore_provider:
description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs'] (native) or ['AzureRM', 'AWS', 'aliyun', 'Google'] (legacy, to be removed May 2026)"
description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs'] (native) or ['AWS', 'aliyun', 'Google'] (legacy, to be removed May 2026)"
default: ~
cc.packages.connection_config:
description: "Azure Storage Cli connection hash"
Expand Down Expand Up @@ -287,7 +287,7 @@ properties:
default: ""

cc.droplets.blobstore_provider:
description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs'] (native) or ['AzureRM', 'AWS', 'aliyun', 'Google'] (legacy, to be removed May 2026)"
description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs'] (native) or ['AWS', 'aliyun', 'Google'] (legacy, to be removed May 2026)"
default: ~
cc.droplets.connection_config:
description: "Azure Storage Cli connection hash"
Expand Down Expand Up @@ -332,7 +332,7 @@ properties:
default: ""

cc.buildpacks.blobstore_provider:
description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs'] (native) or ['AzureRM', 'AWS', 'aliyun', 'Google'] (legacy, to be removed May 2026)"
description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs'] (native) or ['AWS', 'aliyun', 'Google'] (legacy, to be removed May 2026)"
default: ~
cc.buildpacks.connection_config:
description: "Azure Storage Cli connection hash"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ scope = "cc.buildpacks.connection_config"
provider = p("cc.buildpacks.blobstore_provider", nil)
options = {}

# Support both native storage-cli types (azurebs) AND legacy fog names (AzureRM)
# Legacy fog name support to be REMOVED May 2026
if provider == "AzureRM" || provider == "azurebs"
if provider == "azurebs"
options["provider"] = provider
options["account_name"] = p("#{scope}.azure_storage_account_name")
options["container_name"] = p("#{scope}.container_name")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ scope = "cc.droplets.connection_config"
provider = p("cc.droplets.blobstore_provider", nil)
options = {}

# Support both native storage-cli types (azurebs) AND legacy fog names (AzureRM)
# Legacy fog name support to be REMOVED May 2026
if provider == "AzureRM" || provider == "azurebs"
if provider == "azurebs"
options["provider"] = provider
options["account_name"] = p("#{scope}.azure_storage_account_name")
options["container_name"] = p("#{scope}.container_name")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ scope = "cc.packages.connection_config"
provider = p("cc.packages.blobstore_provider", nil)
options = {}

# Support both native storage-cli types (azurebs) AND legacy fog names (AzureRM)
# Legacy fog name support to be REMOVED May 2026
if provider == "AzureRM" || provider == "azurebs"
if provider == "azurebs"
options["provider"] = provider
options["account_name"] = p("#{scope}.azure_storage_account_name")
options["container_name"] = p("#{scope}.container_name")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ scope = "cc.resource_pool.connection_config"
provider = p("cc.resource_pool.blobstore_provider", nil)
options = {}

# Support both native storage-cli types (azurebs) AND legacy fog names (AzureRM)
# Legacy fog name support to be REMOVED May 2026
if provider == "AzureRM" || provider == "azurebs"
if provider == "azurebs"
options["provider"] = provider
options["account_name"] = p("#{scope}.azure_storage_account_name")
options["container_name"] = p("#{scope}.container_name")
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 @@ -531,7 +531,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'] (native) or ['AzureRM', 'AWS', 'aliyun', 'Google'] (legacy, to be removed May 2026)"
description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs'] (native) or ['AWS', 'aliyun', 'Google'] (legacy, to be removed May 2026)"
default: ~
cc.resource_pool.connection_config:
description: "Azure Storage Cli connection hash"
Expand Down Expand Up @@ -584,7 +584,7 @@ properties:
default: ""

cc.packages.blobstore_provider:
description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs'] (native) or ['AzureRM', 'AWS', 'aliyun', 'Google'] (legacy, to be removed May 2026)"
description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs'] (native) or ['AWS', 'aliyun', 'Google'] (legacy, to be removed May 2026)"
default: ~
cc.packages.connection_config:
description: "Azure Storage Cli connection hash"
Expand Down Expand Up @@ -637,7 +637,7 @@ properties:
default: ""

cc.droplets.blobstore_provider:
description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs'] (native) or ['AzureRM', 'AWS', 'aliyun', 'Google'] (legacy, to be removed May 2026)"
description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs'] (native) or ['AWS', 'aliyun', 'Google'] (legacy, to be removed May 2026)"
default: ~
cc.droplets.connection_config:
description: "Azure Storage Cli connection hash"
Expand Down Expand Up @@ -687,7 +687,7 @@ properties:
default: ""

cc.buildpacks.blobstore_provider:
description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs'] (native) or ['AzureRM', 'AWS', 'aliyun', 'Google'] (legacy, to be removed May 2026)"
description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs'] (native) or ['AWS', 'aliyun', 'Google'] (legacy, to be removed May 2026)"
default: ~
cc.buildpacks.connection_config:
description: "Azure Storage Cli connection hash"
Expand Down
2 changes: 0 additions & 2 deletions jobs/cloud_controller_ng/templates/bpm.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ end
def enable_fog_debugging!(config)
if p("cc.log_fog_requests")
case p("cc.packages.fog_connection.provider", "").downcase
when "azurerm"
config["env"]["FOG_DEBUG"] = true
when "aliyun"
config["env"]["ALIYUN_OSS_SDK_LOG_LEVEL"] = "debug"
config["env"]["FOG_DEBUG"] = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ scope = "cc.buildpacks.connection_config"
provider = p("cc.buildpacks.blobstore_provider", nil)
options = {}

# Support both native storage-cli types (azurebs) AND legacy fog names (AzureRM)
# Legacy fog name support to be REMOVED May 2026
if provider == "AzureRM" || provider == "azurebs"
if provider == "azurebs"
options["provider"] = provider
options["account_name"] = p("#{scope}.azure_storage_account_name")
options["container_name"] = p("#{scope}.container_name")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ scope = "cc.droplets.connection_config"
provider = p("cc.droplets.blobstore_provider", nil)
options = {}

# Support both native storage-cli types (azurebs) AND legacy fog names (AzureRM)
# Legacy fog name support to be REMOVED May 2026
if provider == "AzureRM" || provider == "azurebs"
if provider == "azurebs"
options["provider"] = provider
options["account_name"] = p("#{scope}.azure_storage_account_name")
options["container_name"] = p("#{scope}.container_name")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ scope = "cc.packages.connection_config"
provider = p("cc.packages.blobstore_provider", nil)
options = {}

# Support both native storage-cli types (azurebs) AND legacy fog names (AzureRM)
# Legacy fog name support to be REMOVED May 2026
if provider == "AzureRM" || provider == "azurebs"
if provider == "azurebs"
options["provider"] = provider
options["account_name"] = p("#{scope}.azure_storage_account_name")
options["container_name"] = p("#{scope}.container_name")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ scope = "cc.resource_pool.connection_config"
provider = p("cc.resource_pool.blobstore_provider", nil)
options = {}

# Support both native storage-cli types (azurebs) AND legacy fog names (AzureRM)
# Legacy fog name support to be REMOVED May 2026
if provider == "AzureRM" || provider == "azurebs"
if provider == "azurebs"
options["provider"] = provider
options["account_name"] = p("#{scope}.azure_storage_account_name")
options["container_name"] = p("#{scope}.container_name")
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'] (native) or ['AzureRM', 'AWS', 'aliyun', 'Google'] (legacy, to be removed May 2026)"
description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs'] (native) or ['AWS', 'aliyun', 'Google'] (legacy, to be removed May 2026)"
default: ~
cc.resource_pool.connection_config:
description: "Azure Storage Cli connection hash"
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'] (native) or ['AzureRM', 'AWS', 'aliyun', 'Google'] (legacy, to be removed May 2026)"
description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs'] (native) or ['AWS', 'aliyun', 'Google'] (legacy, to be removed May 2026)"
default: ~
cc.packages.connection_config:
description: "Azure Storage Cli connection hash"
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'] (native) or ['AzureRM', 'AWS', 'aliyun', 'Google'] (legacy, to be removed May 2026)"
description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs'] (native) or ['AWS', 'aliyun', 'Google'] (legacy, to be removed May 2026)"
default: ~
cc.droplets.connection_config:
description: "Azure Storage Cli connection hash"
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'] (native) or ['AzureRM', 'AWS', 'aliyun', 'Google'] (legacy, to be removed May 2026)"
description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs'] (native) or ['AWS', 'aliyun', 'Google'] (legacy, to be removed May 2026)"
default: ~
cc.buildpacks.connection_config:
description: "Azure Storage Cli connection hash"
Expand Down
2 changes: 0 additions & 2 deletions jobs/cloud_controller_worker/templates/bpm.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ config = { "processes" => [] }

if p("cc.log_fog_requests")
case p("cc.packages.fog_connection.provider", "").downcase
when "azurerm"
worker_config["env"]["FOG_DEBUG"] = true
when "aliyun"
worker_config["env"]["ALIYUN_OSS_SDK_LOG_LEVEL"] = "debug"
worker_config["env"]["FOG_DEBUG"] = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ scope = "cc.buildpacks.connection_config"
provider = p("cc.buildpacks.blobstore_provider", nil)
options = {}

# Support both native storage-cli types (azurebs) AND legacy fog names (AzureRM)
# Legacy fog name support to be REMOVED May 2026
if provider == "AzureRM" || provider == "azurebs"
if provider == "azurebs"
options["provider"] = provider
options["account_name"] = p("#{scope}.azure_storage_account_name")
options["container_name"] = p("#{scope}.container_name")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ scope = "cc.droplets.connection_config"
provider = p("cc.droplets.blobstore_provider", nil)
options = {}

# Support both native storage-cli types (azurebs) AND legacy fog names (AzureRM)
# Legacy fog name support to be REMOVED May 2026
if provider == "AzureRM" || provider == "azurebs"
if provider == "azurebs"
options["provider"] = provider
options["account_name"] = p("#{scope}.azure_storage_account_name")
options["container_name"] = p("#{scope}.container_name")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ scope = "cc.packages.connection_config"
provider = p("cc.packages.blobstore_provider", nil)
options = {}

# Support both native storage-cli types (azurebs) AND legacy fog names (AzureRM)
# Legacy fog name support to be REMOVED May 2026
if provider == "AzureRM" || provider == "azurebs"
if provider == "azurebs"
options["provider"] = provider
options["account_name"] = p("#{scope}.azure_storage_account_name")
options["container_name"] = p("#{scope}.container_name")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ scope = "cc.resource_pool.connection_config"
provider = p("cc.resource_pool.blobstore_provider", nil)
options = {}

# Support both native storage-cli types (azurebs) AND legacy fog names (AzureRM)
# Legacy fog name support to be REMOVED May 2026
if provider == "AzureRM" || provider == "azurebs"
if provider == "azurebs"
options["provider"] = provider
options["account_name"] = p("#{scope}.azure_storage_account_name")
options["container_name"] = p("#{scope}.container_name")
Expand Down
8 changes: 4 additions & 4 deletions spec/blobstore_benchmark/blobstore_benchmark_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module Test
'logging' => { 'format' => { 'timestamp' => 'rfc3339' } },

'resource_pool' => {
'blobstore_provider' => 'AzureRM',
'blobstore_provider' => 'azurebs',
'blobstore_type' => 'storage-cli',
'connection_config' => {
'azure_storage_account_name' => 'acct',
Expand All @@ -30,7 +30,7 @@ module Test
}
},
'buildpacks' => {
'blobstore_provider' => 'AzureRM',
'blobstore_provider' => 'azurebs',
'blobstore_type' => 'storage-cli',
'connection_config' => {
'azure_storage_account_name' => 'acct',
Expand All @@ -40,7 +40,7 @@ module Test
}
},
'packages' => {
'blobstore_provider' => 'AzureRM',
'blobstore_provider' => 'azurebs',
'blobstore_type' => 'storage-cli',
'connection_config' => {
'azure_storage_account_name' => 'acct',
Expand All @@ -50,7 +50,7 @@ module Test
}
},
'droplets' => {
'blobstore_provider' => 'AzureRM',
'blobstore_provider' => 'azurebs',
'blobstore_type' => 'storage-cli',
'connection_config' => {
'azure_storage_account_name' => 'acct',
Expand Down
Loading