diff --git a/jobs/blobstore_benchmark/templates/cloud_controller_ng.yml.erb b/jobs/blobstore_benchmark/templates/cloud_controller_ng.yml.erb index ad0dbaad47..0442f8048e 100644 --- a/jobs/blobstore_benchmark/templates/cloud_controller_ng.yml.erb +++ b/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 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 ce2fdd5ebd..46843925d5 100644 --- a/jobs/blobstore_benchmark/templates/storage_cli_config_buildpacks.json.erb +++ b/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") 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 5ee6a0e503..edf22c4df1 100644 --- a/jobs/blobstore_benchmark/templates/storage_cli_config_droplets.json.erb +++ b/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") 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 03d387be44..f2c95e480c 100644 --- a/jobs/blobstore_benchmark/templates/storage_cli_config_packages.json.erb +++ b/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") 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 11bb42ca34..c557636c41 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 @@ -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") diff --git a/jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb b/jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb index 5e33e8a692..07d31850a7 100644 --- a/jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb +++ b/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") %> 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 98b6307e78..8f0f82cc72 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 @@ -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") 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 36560b01d7..8728f703c9 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 @@ -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") 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 03d387be44..f2c95e480c 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 @@ -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") 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 530e8a4fbe..7e426a6c1f 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 @@ -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") diff --git a/jobs/cloud_controller_clock/spec b/jobs/cloud_controller_clock/spec index b26b5cc1fb..f5c0d6de35 100644 --- a/jobs/cloud_controller_clock/spec +++ b/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 diff --git a/jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb b/jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb index 68ee126fc3..284d89b29a 100644 --- a/jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb +++ b/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") %> 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 cb321c35f1..9968116e23 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 @@ -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") 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 074ff61c2f..cfa4c9e829 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 @@ -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") 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 1556e3f611..2bca03d5d5 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 @@ -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") 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 53848d75c3..967882fa29 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 @@ -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") diff --git a/jobs/cloud_controller_ng/spec b/jobs/cloud_controller_ng/spec index 3bbbe54954..299b393dd0 100644 --- a/jobs/cloud_controller_ng/spec +++ b/jobs/cloud_controller_ng/spec @@ -126,8 +126,6 @@ provides: - cc.buildpacks.cdn.key_pair_id - cc.buildpacks.cdn.private_key - cc.buildpacks.cdn.uri - - cc.buildpacks.fog_aws_storage_options - - cc.buildpacks.fog_gcp_storage_options - cc.buildpacks.fog_connection - cc.buildpacks.webdav_config.blobstore_timeout - cc.buildpacks.webdav_config.ca_cert @@ -156,8 +154,6 @@ provides: - cc.droplets.cdn.private_key - cc.droplets.cdn.uri - cc.droplets.droplet_directory_key - - cc.droplets.fog_aws_storage_options - - cc.droplets.fog_gcp_storage_options - cc.droplets.fog_connection - cc.droplets.webdav_config.blobstore_timeout - cc.droplets.webdav_config.ca_cert @@ -185,8 +181,6 @@ provides: - cc.packages.cdn.key_pair_id - cc.packages.cdn.private_key - cc.packages.cdn.uri - - cc.packages.fog_aws_storage_options - - cc.packages.fog_gcp_storage_options - cc.packages.fog_connection - cc.packages.max_package_size - cc.packages.max_valid_packages_stored @@ -201,8 +195,6 @@ provides: - cc.resource_pool.cdn.key_pair_id - cc.resource_pool.cdn.private_key - cc.resource_pool.cdn.uri - - cc.resource_pool.fog_aws_storage_options - - cc.resource_pool.fog_gcp_storage_options - cc.resource_pool.fog_connection - cc.resource_pool.maximum_size - cc.resource_pool.minimum_size @@ -532,19 +524,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. See http://docs.cloudfoundry.org/deploying/common/cc-blobstore-config.html#fog-aws-sse for example configuration." - default: {} - cc.resource_pool.fog_gcp_storage_options: - description: "Storage options passed to fog for gcp blobstores" - default: {} cc.resource_pool.webdav_config.blobstore_timeout: description: "The timeout in seconds for requests to the blobstore" default: 5 @@ -585,19 +571,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. See http://docs.cloudfoundry.org/deploying/common/cc-blobstore-config.html#fog-aws-sse for example configuration." - default: {} - cc.packages.fog_gcp_storage_options: - description: "Storage options passed to fog for gcp blobstores" - default: {} cc.packages.webdav_config.blobstore_timeout: description: "The timeout in seconds for requests to the blobstore" default: 5 @@ -638,19 +618,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. See http://docs.cloudfoundry.org/deploying/common/cc-blobstore-config.html#fog-aws-sse for example configuration." - default: {} - cc.droplets.fog_gcp_storage_options: - description: "Storage options passed to fog for gcp blobstores" - default: {} cc.droplets.webdav_config.blobstore_timeout: description: "The timeout in seconds for requests to the blobstore" default: 5 @@ -688,19 +662,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. See http://docs.cloudfoundry.org/deploying/common/cc-blobstore-config.html#fog-aws-sse for example configuration." - default: {} - cc.buildpacks.fog_gcp_storage_options: - description: "Storage options passed to fog for gcp blobstores" - default: {} cc.buildpacks.webdav_config.blobstore_timeout: description: "The timeout in seconds for requests to the blobstore" default: 5 diff --git a/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb b/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb index cee60506da..bbd7348eca 100644 --- a/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb @@ -342,8 +342,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") %> @@ -366,8 +364,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") %> @@ -388,8 +384,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 %> max_staged_droplets_stored: <%= p("cc.droplets.max_staged_droplets_stored") %> buildpacks: @@ -411,8 +405,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") %> 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 cb321c35f1..9968116e23 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 @@ -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") 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 074ff61c2f..cfa4c9e829 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 @@ -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") 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 1556e3f611..2bca03d5d5 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 @@ -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") 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 53848d75c3..967882fa29 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 @@ -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") diff --git a/jobs/cloud_controller_worker/spec b/jobs/cloud_controller_worker/spec index 56d62a4756..791d3f7c77 100644 --- a/jobs/cloud_controller_worker/spec +++ b/jobs/cloud_controller_worker/spec @@ -150,17 +150,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 @@ -201,17 +197,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 @@ -249,17 +241,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 @@ -294,17 +282,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 diff --git a/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb b/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb index 9046ade8c0..de7ded4104 100644 --- a/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb @@ -187,8 +187,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") %> @@ -211,8 +209,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") %> @@ -233,8 +229,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") %> @@ -255,8 +249,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") %> 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 cb321c35f1..9968116e23 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 @@ -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") 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 074ff61c2f..cfa4c9e829 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 @@ -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") 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 ff31624adc..47ff23e7c6 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 @@ -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") 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 9a54138528..dd9112b25e 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 @@ -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") 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 cb9d28761c..3f33d9733a 100644 --- a/spec/cc_deployment_updater/storage_cli_config_jsons_spec.rb +++ b/spec/cc_deployment_updater/storage_cli_config_jsons_spec.rb @@ -110,7 +110,7 @@ def props_for_provider(provider) end describe 'when provider is AWS' do - let(:link_props) { props_for_provider('AWS') } + let(:link_props) { props_for_provider('s3') } let(:cc_link) do Bosh::Template::Test::Link.new( name: 'cloud_controller_internal', @@ -126,14 +126,14 @@ def props_for_provider(provider) it 'maps required properties into the rendered config' do set(link_props, keypath, { - 'provider' => 'AWS', + 'provider' => 's3', 'bucket_name' => 'bucket', 'aws_access_key_id' => 'key', 'aws_secret_access_key' => 'secret' }) json = YAML.safe_load(template.render(props, consumes: links)) expect(json).to include( - 'provider' => 'AWS', + 'provider' => 's3', 'bucket_name' => 'bucket', 'access_key_id' => 'key', 'credentials_source' => 'static', @@ -144,7 +144,7 @@ def props_for_provider(provider) context 'when use_iam_profile is true' do let(:json) do set(link_props, keypath, { - 'provider' => 'AWS', + 'provider' => 's3', 'bucket_name' => 'bucket', 'use_iam_profile' => true }) @@ -153,7 +153,7 @@ def props_for_provider(provider) it 'uses env_or_profile credentials source' do expect(json).to include( - 'provider' => 'AWS', + 'provider' => 's3', 'bucket_name' => 'bucket', 'credentials_source' => 'env_or_profile' ) @@ -167,7 +167,7 @@ def props_for_provider(provider) it 'includes optional properties when provided' do set(link_props, keypath, { - 'provider' => 'AWS', + 'provider' => 's3', 'bucket_name' => 'bucket', 'aws_access_key_id' => 'key', 'aws_secret_access_key' => 'secret', @@ -193,7 +193,7 @@ def props_for_provider(provider) json = YAML.safe_load(template.render(props, consumes: links)) expect(json).to include( - 'provider' => 'AWS', + 'provider' => 's3', 'bucket_name' => 'bucket', 'access_key_id' => 'key', 'secret_access_key' => 'secret', 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 f5972a087f..4c86687c06 100644 --- a/spec/cloud_controller_clock/storage_cli_config_jsons_spec.rb +++ b/spec/cloud_controller_clock/storage_cli_config_jsons_spec.rb @@ -95,7 +95,7 @@ def props_for_provider(provider) end describe 'when provider is AWS' do - let(:props) { props_for_provider('AWS') } + let(:props) { props_for_provider('s3') } storage_cli_templates.each do |(template_path, keypath)| describe template_path do @@ -103,14 +103,14 @@ def props_for_provider(provider) it 'maps required properties into the rendered config' do set(props, keypath, { - 'provider' => 'AWS', + 'provider' => 's3', 'bucket_name' => 'bucket', 'aws_access_key_id' => 'key', 'aws_secret_access_key' => 'secret' }) json = YAML.safe_load(template.render(props, consumes: links)) expect(json).to include( - 'provider' => 'AWS', + 'provider' => 's3', 'bucket_name' => 'bucket', 'access_key_id' => 'key', 'credentials_source' => 'static', @@ -121,7 +121,7 @@ def props_for_provider(provider) context 'when use_iam_profile is true' do let(:json) do set(props, keypath, { - 'provider' => 'AWS', + 'provider' => 's3', 'bucket_name' => 'bucket', 'use_iam_profile' => true }) @@ -130,7 +130,7 @@ def props_for_provider(provider) it 'uses env_or_profile credentials source' do expect(json).to include( - 'provider' => 'AWS', + 'provider' => 's3', 'bucket_name' => 'bucket', 'credentials_source' => 'env_or_profile' ) @@ -144,7 +144,7 @@ def props_for_provider(provider) it 'includes optional properties when provided' do set(props, keypath, { - 'provider' => 'AWS', + 'provider' => 's3', 'bucket_name' => 'bucket', 'aws_access_key_id' => 'key', 'aws_secret_access_key' => 'secret', @@ -170,7 +170,7 @@ def props_for_provider(provider) json = YAML.safe_load(template.render(props, consumes: links)) expect(json).to include( - 'provider' => 'AWS', + 'provider' => 's3', 'bucket_name' => 'bucket', 'access_key_id' => 'key', 'secret_access_key' => 'secret', 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 0429bfbf9a..ac76563150 100644 --- a/spec/cloud_controller_ng/storage_cli_config_jsons_spec.rb +++ b/spec/cloud_controller_ng/storage_cli_config_jsons_spec.rb @@ -95,7 +95,7 @@ def props_for_provider(provider) end describe 'when provider is AWS' do - let(:props) { props_for_provider('AWS') } + let(:props) { props_for_provider('s3') } storage_cli_templates.each do |(template_path, keypath)| describe template_path do @@ -103,14 +103,14 @@ def props_for_provider(provider) it 'maps required properties into the rendered config' do set(props, keypath, { - 'provider' => 'AWS', + 'provider' => 's3', 'bucket_name' => 'bucket', 'aws_access_key_id' => 'key', 'aws_secret_access_key' => 'secret' }) json = YAML.safe_load(template.render(props, consumes: links)) expect(json).to include( - 'provider' => 'AWS', + 'provider' => 's3', 'bucket_name' => 'bucket', 'access_key_id' => 'key', 'credentials_source' => 'static', @@ -121,7 +121,7 @@ def props_for_provider(provider) context 'when use_iam_profile is true' do let(:json) do set(props, keypath, { - 'provider' => 'AWS', + 'provider' => 's3', 'bucket_name' => 'bucket', 'use_iam_profile' => true }) @@ -130,7 +130,7 @@ def props_for_provider(provider) it 'uses env_or_profile credentials source' do expect(json).to include( - 'provider' => 'AWS', + 'provider' => 's3', 'bucket_name' => 'bucket', 'credentials_source' => 'env_or_profile' ) @@ -144,7 +144,7 @@ def props_for_provider(provider) it 'includes optional properties when provided' do set(props, keypath, { - 'provider' => 'AWS', + 'provider' => 's3', 'bucket_name' => 'bucket', 'aws_access_key_id' => 'key', 'aws_secret_access_key' => 'secret', @@ -170,7 +170,7 @@ def props_for_provider(provider) json = YAML.safe_load(template.render(props, consumes: links)) expect(json).to include( - 'provider' => 'AWS', + 'provider' => 's3', 'bucket_name' => 'bucket', 'access_key_id' => 'key', 'secret_access_key' => 'secret', 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 7347cc3357..fe104f7395 100644 --- a/spec/cloud_controller_worker/storage_cli_config_jsons_spec.rb +++ b/spec/cloud_controller_worker/storage_cli_config_jsons_spec.rb @@ -95,7 +95,7 @@ def props_for_provider(provider) end describe 'when provider is AWS' do - let(:props) { props_for_provider('AWS') } + let(:props) { props_for_provider('s3') } storage_cli_templates.each do |(template_path, keypath)| describe template_path do @@ -103,14 +103,14 @@ def props_for_provider(provider) it 'maps required properties into the rendered config' do set(props, keypath, { - 'provider' => 'AWS', + 'provider' => 's3', 'bucket_name' => 'bucket', 'aws_access_key_id' => 'key', 'aws_secret_access_key' => 'secret' }) json = YAML.safe_load(template.render(props, consumes: links)) expect(json).to include( - 'provider' => 'AWS', + 'provider' => 's3', 'bucket_name' => 'bucket', 'access_key_id' => 'key', 'credentials_source' => 'static', @@ -121,7 +121,7 @@ def props_for_provider(provider) context 'when use_iam_profile is true' do let(:json) do set(props, keypath, { - 'provider' => 'AWS', + 'provider' => 's3', 'bucket_name' => 'bucket', 'use_iam_profile' => true }) @@ -130,7 +130,7 @@ def props_for_provider(provider) it 'uses env_or_profile credentials source' do expect(json).to include( - 'provider' => 'AWS', + 'provider' => 's3', 'bucket_name' => 'bucket', 'credentials_source' => 'env_or_profile' ) @@ -144,7 +144,7 @@ def props_for_provider(provider) it 'includes optional properties when provided' do set(props, keypath, { - 'provider' => 'AWS', + 'provider' => 's3', 'bucket_name' => 'bucket', 'aws_access_key_id' => 'key', 'aws_secret_access_key' => 'secret', @@ -170,7 +170,7 @@ def props_for_provider(provider) json = YAML.safe_load(template.render(props, consumes: links)) expect(json).to include( - 'provider' => 'AWS', + 'provider' => 's3', 'bucket_name' => 'bucket', 'access_key_id' => 'key', 'secret_access_key' => 'secret',