Skip to content

Remove fog provider support #671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kathap merged 12 commits into from
Jul 30, 2026
Merged

Remove fog provider support #671

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
119bd26
Remove fog-aws legacy provider support from storage-cli config and specs
kathap Jul 14, 2026
bb96815
Remove fog_connection, log_fog_requests and FOG_DEBUG — complete fog …
kathap Jul 17, 2026
e7cdc6e
Remove webdav and use just dav
kathap Jul 17, 2026
2629904
Leave webdav in
kathap Jul 17, 2026
845f884
Merge branch 'develop' into remove-fog-aws
kathap Jul 17, 2026
0df43fc
Remove legacy webdav provider name
kathap Jul 22, 2026
2a9808d
Adapt tests to use only dav
kathap Jul 22, 2026
0c62335
Remove further fog blobstore support
kathap Jul 29, 2026
fe7a33d
Adapt tests, now that there's no default, the tests must explicitly p…
kathap Jul 29, 2026
130aa04
Set blobstore_type default to storage-cli
kathap Jul 30, 2026
f14178a
Remove dead CDN config parts
kathap Jul 30, 2026
3dadcc8
Remove setup_local_blobstore. Was a no-op stub after fog removal
kathap Jul 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jobs/blobstore_benchmark/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ consumes:

properties:
blobstore_benchmark.mode:
description: "Which blobstore backend to benchmark ('storage-cli' or 'fog')."
description: "Which blobstore backend to benchmark ('storage-cli')."
default: "storage-cli"

blobstore_benchmark.cc_overrides:
Expand Down
2 changes: 1 addition & 1 deletion jobs/blobstore_benchmark/templates/cloud_controller_ng.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[connection_config webdav_config].each do |hk|
section[hk] = {} if section.key?(hk) && section[hk].nil?
end

Expand Down
9 changes: 3 additions & 6 deletions jobs/blobstore_benchmark/templates/storage_cli_config_buildpacks.json.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -89,9 +87,8 @@ if provider == "alioss"
options["bucket_name"] = l.p("#{scope}.aliyun_oss_bucket")
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"

if provider == "dav"
options["provider"] = "dav"
options["user"] = l.p("#{scope}.username")
options["password"] = l.p("#{scope}.password")
Expand Down
9 changes: 3 additions & 6 deletions jobs/blobstore_benchmark/templates/storage_cli_config_droplets.json.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -89,9 +87,8 @@ if provider == "alioss"
options["bucket_name"] = l.p("#{scope}.aliyun_oss_bucket")
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"

if provider == "dav"
options["provider"] = "dav"
options["user"] = l.p("#{scope}.username")
options["password"] = l.p("#{scope}.password")
Expand Down
9 changes: 3 additions & 6 deletions jobs/blobstore_benchmark/templates/storage_cli_config_packages.json.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -89,9 +87,8 @@ if provider == "alioss"
options["bucket_name"] = l.p("#{scope}.aliyun_oss_bucket")
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"

if provider == "dav"
options["provider"] = "dav"
options["user"] = l.p("#{scope}.username")
options["password"] = l.p("#{scope}.password")
Expand Down
9 changes: 3 additions & 6 deletions jobs/blobstore_benchmark/templates/storage_cli_config_resource_pool.json.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -89,9 +87,8 @@ if provider == "alioss"
options["bucket_name"] = l.p("#{scope}.aliyun_oss_bucket")
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"

if provider == "dav"
options["provider"] = "dav"
options["user"] = l.p("#{scope}.username")
options["password"] = l.p("#{scope}.password")
Expand Down
12 changes: 0 additions & 12 deletions jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,6 @@ resource_pool:
key_pair_id: <%= link("cloud_controller_internal").p("cc.resource_pool.cdn.key_pair_id") %>
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") %>
Expand All @@ -228,9 +225,6 @@ packages:
key_pair_id: <%= link("cloud_controller_internal").p("cc.packages.cdn.key_pair_id") %>
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:
Expand All @@ -255,9 +249,6 @@ droplets:
key_pair_id: <%= link("cloud_controller_internal").p("cc.droplets.cdn.key_pair_id") %>
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") %>
Expand All @@ -281,9 +272,6 @@ buildpacks:
key_pair_id: <%= link("cloud_controller_internal").p("cc.buildpacks.cdn.key_pair_id") %>
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") %>

Expand Down
9 changes: 3 additions & 6 deletions jobs/cc_deployment_updater/templates/storage_cli_config_buildpacks.json.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -89,9 +87,8 @@ if provider == "alioss"
options["bucket_name"] = l.p("#{scope}.aliyun_oss_bucket")
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"

if provider == "dav"
options["provider"] = "dav"
options["user"] = l.p("#{scope}.username")
options["password"] = l.p("#{scope}.password")
Expand Down
9 changes: 3 additions & 6 deletions jobs/cc_deployment_updater/templates/storage_cli_config_droplets.json.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -89,9 +87,8 @@ if provider == "alioss"
options["bucket_name"] = l.p("#{scope}.aliyun_oss_bucket")
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"

if provider == "dav"
options["provider"] = "dav"
options["user"] = l.p("#{scope}.username")
options["password"] = l.p("#{scope}.password")
Expand Down
9 changes: 3 additions & 6 deletions jobs/cc_deployment_updater/templates/storage_cli_config_packages.json.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -89,9 +87,8 @@ if provider == "alioss"
options["bucket_name"] = l.p("#{scope}.aliyun_oss_bucket")
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"

if provider == "dav"
options["provider"] = "dav"
options["user"] = l.p("#{scope}.username")
options["password"] = l.p("#{scope}.password")
Expand Down
9 changes: 3 additions & 6 deletions jobs/cc_deployment_updater/templates/storage_cli_config_resource_pool.json.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -89,9 +87,8 @@ if provider == "alioss"
options["bucket_name"] = l.p("#{scope}.aliyun_oss_bucket")
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"

if provider == "dav"
options["provider"] = "dav"
options["user"] = l.p("#{scope}.username")
options["password"] = l.p("#{scope}.password")
Expand Down
48 changes: 12 additions & 36 deletions jobs/cloud_controller_clock/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. Required when blobstore_type is 'storage-cli'. 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"
description: "The type of blobstore backing to use. Valid values: ['webdav', 'storage-cli']"
default: "storage-cli"
cc.resource_pool.webdav_config.blobstore_timeout:
description: "The timeout in seconds for requests to the blobstore"
default: 5
Expand Down Expand Up @@ -231,8 +227,6 @@ properties:
cc.resource_pool.resource_directory_key:
description: "Directory (bucket) used store app resources. It does not have be pre-created."
default: "cc-resources"
cc.resource_pool.fog_connection:
description: "Fog connection hash"
cc.resource_pool.cdn.uri:
description: "URI for a CDN to used for resource pool downloads"
default: ""
Expand All @@ -244,17 +238,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. Required when blobstore_type is 'storage-cli'. 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"
description: "The type of blobstore backing to use. Valid values: ['webdav', 'storage-cli']"
Comment thread
stephanme marked this conversation as resolved.
default: "storage-cli"
cc.packages.webdav_config.blobstore_timeout:
description: "The timeout in seconds for requests to the blobstore"
default: 5
Expand All @@ -279,8 +269,6 @@ properties:
cc.packages.max_package_size:
description: "Maximum size of application package"
default: 1073741824
cc.packages.fog_connection:
description: "Fog connection hash"
cc.packages.cdn.uri:
description: "URI for a CDN to used for app package downloads"
default: ""
Expand All @@ -292,17 +280,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. Required when blobstore_type is 'storage-cli'. 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"
description: "The type of blobstore backing to use. Valid values: ['webdav', 'storage-cli']"
default: "storage-cli"
cc.droplets.webdav_config.blobstore_timeout:
description: "The timeout in seconds for requests to the blobstore"
default: 5
Expand All @@ -324,8 +308,6 @@ properties:
cc.droplets.droplet_directory_key:
description: "Directory (bucket) used store droplets. It does not have be pre-created."
default: "cc-droplets"
cc.droplets.fog_connection:
description: "Fog connection hash"
cc.droplets.cdn.uri:
description: "URI for a CDN to used for droplet downloads"
default: ""
Expand All @@ -337,17 +319,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. Required when blobstore_type is 'storage-cli'. 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"
description: "The type of blobstore backing to use. Valid values: ['webdav', 'storage-cli']"
default: "storage-cli"
cc.buildpacks.webdav_config.blobstore_timeout:
description: "The timeout in seconds for requests to the blobstore"
default: 5
Expand All @@ -369,8 +347,6 @@ properties:
cc.buildpacks.buildpack_directory_key:
description: "Directory (bucket) used store buildpacks. It does not have be pre-created."
default: "cc-buildpacks"
cc.buildpacks.fog_connection:
description: "Fog connection hash"
cc.buildpacks.cdn.uri:
description: "URI for a CDN to used for buildpack downloads"
default: ""
Expand Down
Loading