From c0be8b375f423599abd2f39ba997316ec571e381 Mon Sep 17 00:00:00 2001 From: Wei Quan Date: Fri, 5 Jun 2026 12:20:12 +0200 Subject: [PATCH] Remove fog AzureRM legacy support from capi-release templates and specs --- .../storage_cli_config_buildpacks.json.erb | 4 +--- .../storage_cli_config_droplets.json.erb | 4 +--- .../storage_cli_config_packages.json.erb | 4 +--- .../storage_cli_config_resource_pool.json.erb | 4 +--- .../storage_cli_config_buildpacks.json.erb | 4 +--- .../storage_cli_config_droplets.json.erb | 4 +--- .../storage_cli_config_packages.json.erb | 4 +--- .../storage_cli_config_resource_pool.json.erb | 4 +--- jobs/cloud_controller_clock/spec | 8 ++++---- .../storage_cli_config_buildpacks.json.erb | 4 +--- .../storage_cli_config_droplets.json.erb | 4 +--- .../storage_cli_config_packages.json.erb | 4 +--- .../storage_cli_config_resource_pool.json.erb | 4 +--- jobs/cloud_controller_ng/spec | 8 ++++---- jobs/cloud_controller_ng/templates/bpm.yml.erb | 2 -- .../storage_cli_config_buildpacks.json.erb | 4 +--- .../storage_cli_config_droplets.json.erb | 4 +--- .../storage_cli_config_packages.json.erb | 4 +--- .../storage_cli_config_resource_pool.json.erb | 4 +--- jobs/cloud_controller_worker/spec | 8 ++++---- .../cloud_controller_worker/templates/bpm.yml.erb | 2 -- .../storage_cli_config_buildpacks.json.erb | 4 +--- .../storage_cli_config_droplets.json.erb | 4 +--- .../storage_cli_config_packages.json.erb | 4 +--- .../storage_cli_config_resource_pool.json.erb | 4 +--- .../blobstore_benchmark_spec.rb | 8 ++++---- .../storage_cli_config_jsons_spec.rb | 10 +++++----- .../storage_cli_config_jsons_spec.rb | 10 +++++----- spec/cloud_controller_ng/bpm_spec.rb | 15 --------------- .../storage_cli_config_jsons_spec.rb | 10 +++++----- .../storage_cli_config_jsons_spec.rb | 10 +++++----- 31 files changed, 56 insertions(+), 115 deletions(-) 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 2e6886adf7..f41b87b865 100644 --- a/jobs/blobstore_benchmark/templates/storage_cli_config_buildpacks.json.erb +++ b/jobs/blobstore_benchmark/templates/storage_cli_config_buildpacks.json.erb @@ -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") 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 c72cf61b76..ccc1eeeb09 100644 --- a/jobs/blobstore_benchmark/templates/storage_cli_config_droplets.json.erb +++ b/jobs/blobstore_benchmark/templates/storage_cli_config_droplets.json.erb @@ -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") 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 62b6703cfa..8e2b6fb6ba 100644 --- a/jobs/blobstore_benchmark/templates/storage_cli_config_packages.json.erb +++ b/jobs/blobstore_benchmark/templates/storage_cli_config_packages.json.erb @@ -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") 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 575efadebb..63d97e0b12 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 @@ -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") 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 f5454cf125..5f31d0e2cd 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 @@ -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") 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 050c260f39..afca37f8a1 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 @@ -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") 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 62b6703cfa..8e2b6fb6ba 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 @@ -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") 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 cc3f84adb0..86205906df 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 @@ -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") diff --git a/jobs/cloud_controller_clock/spec b/jobs/cloud_controller_clock/spec index d2c7c699ec..5e6999b47f 100644 --- a/jobs/cloud_controller_clock/spec +++ b/jobs/cloud_controller_clock/spec @@ -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" @@ -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" @@ -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" @@ -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" 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 3df22410bd..ee29390912 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 @@ -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") 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 4616d8afe9..46a7a56d68 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 @@ -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") 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 9b35f91c78..1bd90bac34 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 @@ -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") 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 024e57456e..557cac1d11 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 @@ -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") diff --git a/jobs/cloud_controller_ng/spec b/jobs/cloud_controller_ng/spec index 307b74a6ec..7e7e4c7fcc 100644 --- a/jobs/cloud_controller_ng/spec +++ b/jobs/cloud_controller_ng/spec @@ -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" @@ -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" @@ -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" @@ -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" diff --git a/jobs/cloud_controller_ng/templates/bpm.yml.erb b/jobs/cloud_controller_ng/templates/bpm.yml.erb index 96ad1edc75..b151742683 100644 --- a/jobs/cloud_controller_ng/templates/bpm.yml.erb +++ b/jobs/cloud_controller_ng/templates/bpm.yml.erb @@ -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 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 3df22410bd..ee29390912 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 @@ -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") 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 45024f6ccd..44a058c2ff 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 @@ -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") 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 d345fe3d88..f7c691909f 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 @@ -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") 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 024e57456e..557cac1d11 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 @@ -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") diff --git a/jobs/cloud_controller_worker/spec b/jobs/cloud_controller_worker/spec index c59bdbb9b6..ed2f14aad0 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'] (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" @@ -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" @@ -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" @@ -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" diff --git a/jobs/cloud_controller_worker/templates/bpm.yml.erb b/jobs/cloud_controller_worker/templates/bpm.yml.erb index 4477073463..de05490274 100644 --- a/jobs/cloud_controller_worker/templates/bpm.yml.erb +++ b/jobs/cloud_controller_worker/templates/bpm.yml.erb @@ -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 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 3df22410bd..ee29390912 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 @@ -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") 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 4616d8afe9..46a7a56d68 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 @@ -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") 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 d345fe3d88..f7c691909f 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 @@ -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") 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 024e57456e..557cac1d11 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 @@ -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") diff --git a/spec/blobstore_benchmark/blobstore_benchmark_spec.rb b/spec/blobstore_benchmark/blobstore_benchmark_spec.rb index 99c2dc29cf..2654aa0cd6 100644 --- a/spec/blobstore_benchmark/blobstore_benchmark_spec.rb +++ b/spec/blobstore_benchmark/blobstore_benchmark_spec.rb @@ -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', @@ -30,7 +30,7 @@ module Test } }, 'buildpacks' => { - 'blobstore_provider' => 'AzureRM', + 'blobstore_provider' => 'azurebs', 'blobstore_type' => 'storage-cli', 'connection_config' => { 'azure_storage_account_name' => 'acct', @@ -40,7 +40,7 @@ module Test } }, 'packages' => { - 'blobstore_provider' => 'AzureRM', + 'blobstore_provider' => 'azurebs', 'blobstore_type' => 'storage-cli', 'connection_config' => { 'azure_storage_account_name' => 'acct', @@ -50,7 +50,7 @@ module Test } }, 'droplets' => { - 'blobstore_provider' => 'AzureRM', + 'blobstore_provider' => 'azurebs', 'blobstore_type' => 'storage-cli', 'connection_config' => { 'azure_storage_account_name' => 'acct', 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 24bec8ab58..db22d8c6b7 100644 --- a/spec/cc_deployment_updater/storage_cli_config_jsons_spec.rb +++ b/spec/cc_deployment_updater/storage_cli_config_jsons_spec.rb @@ -59,8 +59,8 @@ def props_for_provider(provider) end end - describe 'when provider is AzureRM' do - let(:link_props) { props_for_provider('AzureRM') } + describe 'when provider is azurebs' do + let(:link_props) { props_for_provider('azurebs') } let(:cc_link) do Bosh::Template::Test::Link.new( name: 'cloud_controller_internal', @@ -76,7 +76,7 @@ def props_for_provider(provider) it 'renders and normalizes put_timeout_in_seconds to "41" when blank' do set(link_props, keypath, { - 'provider' => 'AzureRM', + 'provider' => 'azurebs', 'azure_storage_account_name' => 'acc', 'azure_storage_access_key' => 'key', 'container_name' => 'cont', @@ -84,7 +84,7 @@ def props_for_provider(provider) }) json = YAML.safe_load(template.render(props, consumes: links)) expect(json).to include( - 'provider' => 'AzureRM', + 'provider' => 'azurebs', 'account_name' => 'acc', 'account_key' => 'key', 'container_name' => 'cont', @@ -94,7 +94,7 @@ def props_for_provider(provider) it 'keeps existing put_timeout_in_seconds when provided' do set(link_props, keypath, { - 'provider' => 'AzureRM', + 'provider' => 'azurebs', 'azure_storage_account_name' => 'acc', 'azure_storage_access_key' => 'key', 'container_name' => 'cont', 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 ff1fbc52a1..10d26c1bba 100644 --- a/spec/cloud_controller_clock/storage_cli_config_jsons_spec.rb +++ b/spec/cloud_controller_clock/storage_cli_config_jsons_spec.rb @@ -52,8 +52,8 @@ def props_for_provider(provider) end end - describe 'when provider is AzureRM' do - let(:props) { props_for_provider('AzureRM') } + describe 'when provider is azurebs' do + let(:props) { props_for_provider('azurebs') } TEMPLATES.each_value do |(template_path, keypath)| describe template_path do @@ -61,7 +61,7 @@ def props_for_provider(provider) it 'renders and normalizes put_timeout_in_seconds to "41" when blank' do set(props, keypath, { - 'provider' => 'AzureRM', + 'provider' => 'azurebs', 'azure_storage_account_name' => 'acc', 'azure_storage_access_key' => 'key', 'container_name' => 'cont', @@ -69,7 +69,7 @@ def props_for_provider(provider) }) json = YAML.safe_load(template.render(props, consumes: links)) expect(json).to include( - 'provider' => 'AzureRM', + 'provider' => 'azurebs', 'account_name' => 'acc', 'account_key' => 'key', 'container_name' => 'cont', @@ -79,7 +79,7 @@ def props_for_provider(provider) it 'keeps existing put_timeout_in_seconds when provided' do set(props, keypath, { - 'provider' => 'AzureRM', + 'provider' => 'azurebs', 'azure_storage_account_name' => 'acc', 'azure_storage_access_key' => 'key', 'container_name' => 'cont', diff --git a/spec/cloud_controller_ng/bpm_spec.rb b/spec/cloud_controller_ng/bpm_spec.rb index cc0d3d63c1..388e556243 100644 --- a/spec/cloud_controller_ng/bpm_spec.rb +++ b/spec/cloud_controller_ng/bpm_spec.rb @@ -39,9 +39,6 @@ def valkey_volume_mounted?(process) let(:properties_debug_gcp) do { 'cc' => { 'log_fog_requests' => true, 'packages' => { 'fog_connection' => { 'provider' => 'Google' } } } } end - let(:properties_debug_azure) do - { 'cc' => { 'log_fog_requests' => true, 'packages' => { 'fog_connection' => { 'provider' => 'AzureRm' } } } } - end let(:properties_debug_ali) do { 'cc' => { 'log_fog_requests' => true, 'packages' => { 'fog_connection' => { 'provider' => 'aliyun' } } } } end @@ -64,18 +61,6 @@ def valkey_volume_mounted?(process) expect_default_debug_env_vars(results[0]['env']) end - it 'sets the FOG_DEBUG env var for Azure' do - template_hash = YAML.safe_load(template.render(properties_debug_azure, consumes: {})) - - results = template_hash['processes'].select { |p| p['name'].include?('cloud_controller_ng') } - expect(results.length).to eq(1) - env_vars = results[0]['env'] - expect(env_vars).not_to have_key('DEBUG') - expect(env_vars).to have_key('FOG_DEBUG') - expect(env_vars).not_to have_key('ALIYUN_OSS_SDK_LOG_LEVEL') - expect(env_vars['FOG_DEBUG']).to be(true) - end - it 'sets the ALIYUN_OSS_SDK_LOG_LEVEL env var for Ali' do template_hash = YAML.safe_load(template.render(properties_debug_ali, consumes: {})) 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 a44653048c..b0affbedbd 100644 --- a/spec/cloud_controller_ng/storage_cli_config_jsons_spec.rb +++ b/spec/cloud_controller_ng/storage_cli_config_jsons_spec.rb @@ -53,8 +53,8 @@ def props_for_provider(provider) end end - describe 'when provider is AzureRM' do - let(:props) { props_for_provider('AzureRM') } + describe 'when provider is azurebs' do + let(:props) { props_for_provider('azurebs') } TEMPLATES.each_value do |(template_path, keypath)| describe template_path do @@ -62,7 +62,7 @@ def props_for_provider(provider) it 'renders and normalizes put_timeout_in_seconds to "41" when blank' do set(props, keypath, { - 'provider' => 'AzureRM', + 'provider' => 'azurebs', 'azure_storage_account_name' => 'acc', 'azure_storage_access_key' => 'key', 'container_name' => 'cont', @@ -70,7 +70,7 @@ def props_for_provider(provider) }) json = YAML.safe_load(template.render(props, consumes: links)) expect(json).to include( - 'provider' => 'AzureRM', + 'provider' => 'azurebs', 'account_name' => 'acc', 'account_key' => 'key', 'container_name' => 'cont', @@ -80,7 +80,7 @@ def props_for_provider(provider) it 'keeps existing put_timeout_in_seconds when provided' do set(props, keypath, { - 'provider' => 'AzureRM', + 'provider' => 'azurebs', 'azure_storage_account_name' => 'acc', 'azure_storage_access_key' => 'key', 'container_name' => 'cont', 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 8d08c5f950..9635b9d009 100644 --- a/spec/cloud_controller_worker/storage_cli_config_jsons_spec.rb +++ b/spec/cloud_controller_worker/storage_cli_config_jsons_spec.rb @@ -52,8 +52,8 @@ def props_for_provider(provider) end end - describe 'when provider is AzureRM' do - let(:props) { props_for_provider('AzureRM') } + describe 'when provider is azurebs' do + let(:props) { props_for_provider('azurebs') } TEMPLATES.each_value do |(template_path, keypath)| describe template_path do @@ -61,7 +61,7 @@ def props_for_provider(provider) it 'renders and normalizes put_timeout_in_seconds to "41" when blank' do set(props, keypath, { - 'provider' => 'AzureRM', + 'provider' => 'azurebs', 'azure_storage_account_name' => 'acc', 'azure_storage_access_key' => 'key', 'container_name' => 'cont', @@ -69,7 +69,7 @@ def props_for_provider(provider) }) json = YAML.safe_load(template.render(props, consumes: links)) expect(json).to include( - 'provider' => 'AzureRM', + 'provider' => 'azurebs', 'account_name' => 'acc', 'account_key' => 'key', 'container_name' => 'cont', @@ -79,7 +79,7 @@ def props_for_provider(provider) it 'keeps existing put_timeout_in_seconds when provided' do set(props, keypath, { - 'provider' => 'AzureRM', + 'provider' => 'azurebs', 'azure_storage_account_name' => 'acc', 'azure_storage_access_key' => 'key', 'container_name' => 'cont',