Remove fog-aws legacy provider support from storage-cli config and specs

jobs/blobstore_benchmark/templates/cloud_controller_ng.yml.erb

@@ -60,7 +60,7 @@
     section = cc_cfg[k]
     next unless section.is_a?(Hash)
 
-    %w[fog_connection connection_config fog_aws_storage_options fog_gcp_storage_options webdav_config].each do |hk|
+    %w[fog_connection connection_config webdav_config].each do |hk|
       section[hk] = {} if section.key?(hk) && section[hk].nil?
     end
 

jobs/blobstore_benchmark/templates/storage_cli_config_buildpacks.json.erb

@@ -44,9 +44,7 @@ if provider == "gcs"
   add_optional(options, "encryption_key", l.p("#{scope}.encryption_key", nil))
 end
 
-# Support both native storage-cli types (s3) AND legacy fog names (AWS)
-# Legacy fog name support to be REMOVED May 2026
-if provider == "AWS" || provider == "s3"
+if provider == "s3"
   options["provider"] = provider
   options["bucket_name"] = l.p("#{scope}.bucket_name")
   if l.p("#{scope}.use_iam_profile", false)
@@ -86,7 +84,6 @@ if provider == "alioss"
 end
 
 # Support both native storage-cli types (dav) AND legacy fog names (webdav)
-# Legacy fog name support to be REMOVED May 2026
 if provider == "webdav" || provider == "dav"
   options["provider"] = "dav"
   options["user"] = l.p("#{scope}.username")

jobs/blobstore_benchmark/templates/storage_cli_config_droplets.json.erb

@@ -44,9 +44,7 @@ if provider == "gcs"
   add_optional(options, "encryption_key", l.p("#{scope}.encryption_key", nil))
 end
 
-# Support both native storage-cli types (s3) AND legacy fog names (AWS)
-# Legacy fog name support to be REMOVED May 2026
-if provider == "AWS" || provider == "s3"
+if provider == "s3"
   options["provider"] = provider
   options["bucket_name"] = l.p("#{scope}.bucket_name")
   if l.p("#{scope}.use_iam_profile", false)
@@ -86,7 +84,6 @@ if provider == "alioss"
 end
 
 # Support both native storage-cli types (dav) AND legacy fog names (webdav)
-# Legacy fog name support to be REMOVED May 2026
 if provider == "webdav" || provider == "dav"
   options["provider"] = "dav"
   options["user"] = l.p("#{scope}.username")

jobs/blobstore_benchmark/templates/storage_cli_config_packages.json.erb

@@ -44,9 +44,7 @@ if provider == "gcs"
   add_optional(options, "encryption_key", l.p("#{scope}.encryption_key", nil))
 end
 
-# Support both native storage-cli types (s3) AND legacy fog names (AWS)
-# Legacy fog name support to be REMOVED May 2026
-if provider == "AWS" || provider == "s3"
+if provider == "s3"
   options["provider"] = provider
   options["bucket_name"] = l.p("#{scope}.bucket_name")
   if l.p("#{scope}.use_iam_profile", false)
@@ -86,7 +84,6 @@ if provider == "alioss"
 end
 
 # Support both native storage-cli types (dav) AND legacy fog names (webdav)
-# Legacy fog name support to be REMOVED May 2026
 if provider == "webdav" || provider == "dav"
   options["provider"] = "dav"
   options["user"] = l.p("#{scope}.username")

jobs/blobstore_benchmark/templates/storage_cli_config_resource_pool.json.erb

@@ -44,9 +44,7 @@ if provider == "gcs"
   add_optional(options, "encryption_key", l.p("#{scope}.encryption_key", nil))
 end
 
-# Support both native storage-cli types (s3) AND legacy fog names (AWS)
-# Legacy fog name support to be REMOVED May 2026
-if provider == "AWS" || provider == "s3"
+if provider == "s3"
   options["provider"] = provider
   options["bucket_name"] = l.p("#{scope}.bucket_name")
   if l.p("#{scope}.use_iam_profile", false)
@@ -86,7 +84,6 @@ if provider == "alioss"
 end
 
 # Support both native storage-cli types (dav) AND legacy fog names (webdav)
-# Legacy fog name support to be REMOVED May 2026
 if provider == "webdav" || provider == "dav"
   options["provider"] = "dav"
   options["user"] = l.p("#{scope}.username")

jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb

@@ -202,8 +202,6 @@ resource_pool:
     private_key: <%= link("cloud_controller_internal").p("cc.resource_pool.cdn.private_key").inspect %>
   <% end %>
   fog_connection: <%= link("cloud_controller_internal").p("cc.resource_pool.fog_connection", {}).to_json %>
-  fog_aws_storage_options: <%= link("cloud_controller_internal").p("cc.resource_pool.fog_aws_storage_options", {}).to_json %>
-  fog_gcp_storage_options: <%= link("cloud_controller_internal").p("cc.resource_pool.fog_gcp_storage_options", {}).to_json %>
 
 packages:
   blobstore_type: <%= link("cloud_controller_internal").p("cc.packages.blobstore_type") %>
@@ -229,8 +227,6 @@ packages:
     private_key: <%= link("cloud_controller_internal").p("cc.packages.cdn.private_key").inspect %>
   <% end %>
   fog_connection: <%= link("cloud_controller_internal").p("cc.packages.fog_connection", {}).to_json %>
-  fog_aws_storage_options: <%= link("cloud_controller_internal").p("cc.packages.fog_aws_storage_options", {}).to_json %>
-  fog_gcp_storage_options: <%= link("cloud_controller_internal").p("cc.packages.fog_gcp_storage_options", {}).to_json %>
 
 
 droplets:
@@ -256,8 +252,6 @@ droplets:
     private_key: <%= link("cloud_controller_internal").p("cc.droplets.cdn.private_key").inspect %>
   <% end %>
   fog_connection: <%= link("cloud_controller_internal").p("cc.droplets.fog_connection", {}).to_json %>
-  fog_aws_storage_options: <%= link("cloud_controller_internal").p("cc.droplets.fog_aws_storage_options", {}).to_json %>
-  fog_gcp_storage_options: <%= link("cloud_controller_internal").p("cc.droplets.fog_gcp_storage_options", {}).to_json %>
 
 buildpacks:
   blobstore_type: <%= link("cloud_controller_internal").p("cc.buildpacks.blobstore_type") %>
@@ -282,8 +276,6 @@ buildpacks:
     private_key: <%= link("cloud_controller_internal").p("cc.buildpacks.cdn.private_key").inspect %>
   <% end %>
   fog_connection: <%= link("cloud_controller_internal").p("cc.buildpacks.fog_connection", {}).to_json %>
-  fog_aws_storage_options: <%= link("cloud_controller_internal").p("cc.buildpacks.fog_aws_storage_options", {}).to_json %>
-  fog_gcp_storage_options: <%= link("cloud_controller_internal").p("cc.buildpacks.fog_gcp_storage_options", {}).to_json %>
 
 skip_cert_verify: <%= link("cloud_controller_internal").p("ssl.skip_cert_verify") %>
 

jobs/cc_deployment_updater/templates/storage_cli_config_buildpacks.json.erb

@@ -44,9 +44,7 @@ if provider == "gcs"
   add_optional(options, "encryption_key", l.p("#{scope}.encryption_key", nil))
 end
 
-# Support both native storage-cli types (s3) AND legacy fog names (AWS)
-# Legacy fog name support to be REMOVED May 2026
-if provider == "AWS" || provider == "s3"
+if provider == "s3"
   options["provider"] = provider
   options["bucket_name"] = l.p("#{scope}.bucket_name")
   if l.p("#{scope}.use_iam_profile", false)
@@ -86,7 +84,6 @@ if provider == "alioss"
 end
 
 # Support both native storage-cli types (dav) AND legacy fog names (webdav)
-# Legacy fog name support to be REMOVED May 2026
 if provider == "webdav" || provider == "dav"
   options["provider"] = "dav"
   options["user"] = l.p("#{scope}.username")

jobs/cc_deployment_updater/templates/storage_cli_config_droplets.json.erb

@@ -44,9 +44,7 @@ if provider == "gcs"
   add_optional(options, "encryption_key", l.p("#{scope}.encryption_key", nil))
 end
 
-# Support both native storage-cli types (s3) AND legacy fog names (AWS)
-# Legacy fog name support to be REMOVED May 2026
-if provider == "AWS" || provider == "s3"
+if provider == "s3"
   options["provider"] = provider
   options["bucket_name"] = l.p("#{scope}.bucket_name")
   if l.p("#{scope}.use_iam_profile", false)
@@ -86,7 +84,6 @@ if provider == "alioss"
 end
 
 # Support both native storage-cli types (dav) AND legacy fog names (webdav)
-# Legacy fog name support to be REMOVED May 2026
 if provider == "webdav" || provider == "dav"
   options["provider"] = "dav"
   options["user"] = l.p("#{scope}.username")

jobs/cc_deployment_updater/templates/storage_cli_config_packages.json.erb

@@ -44,9 +44,7 @@ if provider == "gcs"
   add_optional(options, "encryption_key", l.p("#{scope}.encryption_key", nil))
 end
 
-# Support both native storage-cli types (s3) AND legacy fog names (AWS)
-# Legacy fog name support to be REMOVED May 2026
-if provider == "AWS" || provider == "s3"
+if provider == "s3"
   options["provider"] = provider
   options["bucket_name"] = l.p("#{scope}.bucket_name")
   if l.p("#{scope}.use_iam_profile", false)
@@ -86,7 +84,6 @@ if provider == "alioss"
 end
 
 # Support both native storage-cli types (dav) AND legacy fog names (webdav)
-# Legacy fog name support to be REMOVED May 2026
 if provider == "webdav" || provider == "dav"
   options["provider"] = "dav"
   options["user"] = l.p("#{scope}.username")

jobs/cc_deployment_updater/templates/storage_cli_config_resource_pool.json.erb

@@ -44,9 +44,7 @@ if provider == "gcs"
   add_optional(options, "encryption_key", l.p("#{scope}.encryption_key", nil))
 end
 
-# Support both native storage-cli types (s3) AND legacy fog names (AWS)
-# Legacy fog name support to be REMOVED May 2026
-if provider == "AWS" || provider == "s3"
+if provider == "s3"
   options["provider"] = provider
   options["bucket_name"] = l.p("#{scope}.bucket_name")
   if l.p("#{scope}.use_iam_profile", false)
@@ -86,7 +84,6 @@ if provider == "alioss"
 end
 
 # Support both native storage-cli types (dav) AND legacy fog names (webdav)
-# Legacy fog name support to be REMOVED May 2026
 if provider == "webdav" || provider == "dav"
   options["provider"] = "dav"
   options["user"] = l.p("#{scope}.username")

jobs/cloud_controller_clock/spec

@@ -193,17 +193,13 @@ 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'] (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). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead."
     default: ~
   cc.resource_pool.connection_config:
       description: "Storage CLI connection configuration"
   cc.resource_pool.blobstore_type:
     description: "The type of blobstore backing to use. Valid values: ['fog', 'webdav', 'storage-cli']"
     default: "fog"
-  cc.resource_pool.fog_aws_storage_options:
-    description: "Storage options passed to fog for aws blobstores. Valid keys: ['encryption']."
-  cc.resource_pool.fog_gcp_storage_options:
-    description: "Storage options passed to fog for gcp blobstores"
   cc.resource_pool.webdav_config.blobstore_timeout:
     description: "The timeout in seconds for requests to the blobstore"
     default: 5
@@ -244,17 +240,13 @@ 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'] (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). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead."
     default: ~
   cc.packages.connection_config:
     description: "Storage CLI connection configuration"
   cc.packages.blobstore_type:
     description: "The type of blobstore backing to use. Valid values: ['fog', 'webdav', 'storage-cli']"
     default: "fog"
-  cc.packages.fog_aws_storage_options:
-    description: "Storage options passed to fog for aws blobstores. Valid keys: ['encryption']."
-  cc.packages.fog_gcp_storage_options:
-    description: "Storage options passed to fog for gcp blobstores"
   cc.packages.webdav_config.blobstore_timeout:
     description: "The timeout in seconds for requests to the blobstore"
     default: 5
@@ -292,17 +284,13 @@ 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'] (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). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead."
     default: ~
   cc.droplets.connection_config:
     description: "Storage CLI connection configuration"
   cc.droplets.blobstore_type:
     description: "The type of blobstore backing to use. Valid values: ['fog', 'webdav', 'storage-cli']"
     default: "fog"
-  cc.droplets.fog_aws_storage_options:
-    description: "Storage options passed to fog for aws blobstores. Valid keys: ['encryption']."
-  cc.droplets.fog_gcp_storage_options:
-    description: "Storage options passed to fog for gcp blobstores"
   cc.droplets.webdav_config.blobstore_timeout:
     description: "The timeout in seconds for requests to the blobstore"
     default: 5
@@ -337,17 +325,13 @@ 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'] (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). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead."
     default: ~
   cc.buildpacks.connection_config:
     description: "Storage CLI connection configuration"
   cc.buildpacks.blobstore_type:
     description: "The type of blobstore backing to use. Valid values: ['fog', 'webdav', 'storage-cli']"
     default: "fog"
-  cc.buildpacks.fog_aws_storage_options:
-    description: "Storage options passed to fog for aws blobstores. Valid keys: ['encryption']."
-  cc.buildpacks.fog_gcp_storage_options:
-    description: "Storage options passed to fog for gcp blobstores"
   cc.buildpacks.webdav_config.blobstore_timeout:
     description: "The timeout in seconds for requests to the blobstore"
     default: 5

jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb

@@ -222,8 +222,6 @@ resource_pool:
     private_key: <%= p("cc.resource_pool.cdn.private_key").inspect %>
   <% end %>
   fog_connection: <%= p("cc.resource_pool.fog_connection", {}).to_json %>
-  fog_aws_storage_options: <%= p("cc.resource_pool.fog_aws_storage_options", {}).to_json %>
-  fog_gcp_storage_options: <%= p("cc.resource_pool.fog_gcp_storage_options", {}).to_json %>
 
 packages:
   blobstore_type: <%= p("cc.packages.blobstore_type") %>
@@ -245,8 +243,6 @@ packages:
     private_key: <%= p("cc.packages.cdn.private_key").inspect %>
   <% end %>
   fog_connection: <%= p("cc.packages.fog_connection", {}).to_json %>
-  fog_aws_storage_options: <%= p("cc.packages.fog_aws_storage_options", {}).to_json %>
-  fog_gcp_storage_options: <%= p("cc.packages.fog_gcp_storage_options", {}).to_json %>
 
 droplets:
   blobstore_type: <%= p("cc.droplets.blobstore_type") %>
@@ -267,8 +263,6 @@ droplets:
     private_key: <%= p("cc.droplets.cdn.private_key").inspect %>
   <% end %>
   fog_connection: <%= p("cc.droplets.fog_connection", {}).to_json %>
-  fog_aws_storage_options: <%= p("cc.droplets.fog_aws_storage_options", {}).to_json %>
-  fog_gcp_storage_options: <%= p("cc.droplets.fog_gcp_storage_options", {}).to_json %>
 
 buildpacks:
   blobstore_type: <%= p("cc.buildpacks.blobstore_type") %>
@@ -289,8 +283,6 @@ buildpacks:
     private_key: <%= p("cc.buildpacks.cdn.private_key").inspect %>
   <% end %>
   fog_connection: <%= p("cc.buildpacks.fog_connection", {}).to_json %>
-  fog_aws_storage_options: <%= p("cc.buildpacks.fog_aws_storage_options", {}).to_json %>
-  fog_gcp_storage_options: <%= p("cc.buildpacks.fog_gcp_storage_options", {}).to_json %>
 
 db_encryption_key: <%= p("cc.db_encryption_key") %>
 

jobs/cloud_controller_clock/templates/storage_cli_config_buildpacks.json.erb

@@ -42,9 +42,7 @@ if provider == "gcs"
   add_optional(options, "encryption_key", p("#{scope}.encryption_key", nil))
 end
 
-# Support both native storage-cli types (s3) AND legacy fog names (AWS)
-# Legacy fog name support to be REMOVED May 2026
-if provider == "AWS" || provider == "s3"
+if provider == "s3"
   options["provider"] = provider
   options["bucket_name"] = p("#{scope}.bucket_name")
   if p("#{scope}.use_iam_profile", false)
@@ -84,7 +82,6 @@ if provider == "alioss"
 end
 
 # Support both native storage-cli types (dav) AND legacy fog names (webdav)
-# Legacy fog name support to be REMOVED May 2026
 if provider == "webdav" || provider == "dav"
   options["provider"] = "dav"
   options["user"] = p("#{scope}.username")

jobs/cloud_controller_clock/templates/storage_cli_config_droplets.json.erb

@@ -42,9 +42,7 @@ if provider == "gcs"
   add_optional(options, "encryption_key", p("#{scope}.encryption_key", nil))
 end
 
-# Support both native storage-cli types (s3) AND legacy fog names (AWS)
-# Legacy fog name support to be REMOVED May 2026
-if provider == "AWS" || provider == "s3"
+if provider == "s3"
   options["provider"] = provider
   options["bucket_name"] = p("#{scope}.bucket_name")
   if p("#{scope}.use_iam_profile", false)
@@ -84,7 +82,6 @@ if provider == "alioss"
 end
 
 # Support both native storage-cli types (dav) AND legacy fog names (webdav)
-# Legacy fog name support to be REMOVED May 2026
 if provider == "webdav" || provider == "dav"
   options["provider"] = "dav"
   options["user"] = p("#{scope}.username")

jobs/cloud_controller_clock/templates/storage_cli_config_packages.json.erb

@@ -42,9 +42,7 @@ if provider == "gcs"
   add_optional(options, "encryption_key", p("#{scope}.encryption_key", nil))
 end
 
-# Support both native storage-cli types (s3) AND legacy fog names (AWS)
-# Legacy fog name support to be REMOVED May 2026
-if provider == "AWS" || provider == "s3"
+if provider == "s3"
   options["provider"] = provider
   options["bucket_name"] = p("#{scope}.bucket_name")
   if p("#{scope}.use_iam_profile", false)
@@ -84,7 +82,6 @@ if provider == "alioss"
 end
 
 # Support both native storage-cli types (dav) AND legacy fog names (webdav)
-# Legacy fog name support to be REMOVED May 2026
 if provider == "webdav" || provider == "dav"
   options["provider"] = "dav"
   options["user"] = p("#{scope}.username")

jobs/cloud_controller_clock/templates/storage_cli_config_resource_pool.json.erb

@@ -42,9 +42,7 @@ if provider == "gcs"
   add_optional(options, "encryption_key", p("#{scope}.encryption_key", nil))
 end
 
-# Support both native storage-cli types (s3) AND legacy fog names (AWS)
-# Legacy fog name support to be REMOVED May 2026
-if provider == "AWS" || provider == "s3"
+if provider == "s3"
   options["provider"] = provider
   options["bucket_name"] = p("#{scope}.bucket_name")
   if p("#{scope}.use_iam_profile", false)
@@ -84,7 +82,6 @@ if provider == "alioss"
 end
 
 # Support both native storage-cli types (dav) AND legacy fog names (webdav)
-# Legacy fog name support to be REMOVED May 2026
 if provider == "webdav" || provider == "dav"
   options["provider"] = "dav"
   options["user"] = p("#{scope}.username")