Skip to content

Remove fog-aliyun support #660

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

Open
kathap wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Remove fog-aliyun support #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba9a0db
Remove fog-aliyun support
kathap Jun 12, 2026
7c5875d
Merge branch 'develop' into remove-fog-aliyun
kathap Jun 25, 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
4 changes: 1 addition & 3 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 @@ -79,9 +79,7 @@ if provider == "AWS" || provider == "s3"
add_optional(options, "multipart_copy_part_size", l.p("#{scope}.multipart_copy_part_size", nil))
end

# Support both native storage-cli types (alioss) AND legacy fog names (aliyun)
# Legacy fog name support to be REMOVED May 2026
if provider == "aliyun" || provider == "alioss"
if provider == "alioss"
options["provider"] = provider
options["access_key_id"] = l.p("#{scope}.aliyun_accesskey_id")
options["access_key_secret"] = l.p("#{scope}.aliyun_accesskey_secret")
Expand Down
4 changes: 1 addition & 3 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 @@ -79,9 +79,7 @@ if provider == "AWS" || provider == "s3"
add_optional(options, "multipart_copy_part_size", l.p("#{scope}.multipart_copy_part_size", nil))
end

# Support both native storage-cli types (alioss) AND legacy fog names (aliyun)
# Legacy fog name support to be REMOVED May 2026
if provider == "aliyun" || provider == "alioss"
if provider == "alioss"
options["provider"] = provider
options["access_key_id"] = l.p("#{scope}.aliyun_accesskey_id")
options["access_key_secret"] = l.p("#{scope}.aliyun_accesskey_secret")
Expand Down
4 changes: 1 addition & 3 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 @@ -79,9 +79,7 @@ if provider == "AWS" || provider == "s3"
add_optional(options, "multipart_copy_part_size", l.p("#{scope}.multipart_copy_part_size", nil))
end

# Support both native storage-cli types (alioss) AND legacy fog names (aliyun)
# Legacy fog name support to be REMOVED May 2026
if provider == "aliyun" || provider == "alioss"
if provider == "alioss"
options["provider"] = provider
options["access_key_id"] = l.p("#{scope}.aliyun_accesskey_id")
options["access_key_secret"] = l.p("#{scope}.aliyun_accesskey_secret")
Expand Down
4 changes: 1 addition & 3 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 @@ -79,9 +79,7 @@ if provider == "AWS" || provider == "s3"
add_optional(options, "multipart_copy_part_size", l.p("#{scope}.multipart_copy_part_size", nil))
end

# Support both native storage-cli types (alioss) AND legacy fog names (aliyun)
# Legacy fog name support to be REMOVED May 2026
if provider == "aliyun" || provider == "alioss"
if provider == "alioss"
options["provider"] = provider
options["access_key_id"] = l.p("#{scope}.aliyun_accesskey_id")
options["access_key_secret"] = l.p("#{scope}.aliyun_accesskey_secret")
Expand Down
4 changes: 1 addition & 3 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 @@ -79,9 +79,7 @@ if provider == "AWS" || provider == "s3"
add_optional(options, "multipart_copy_part_size", l.p("#{scope}.multipart_copy_part_size", nil))
end

# Support both native storage-cli types (alioss) AND legacy fog names (aliyun)
# Legacy fog name support to be REMOVED May 2026
if provider == "aliyun" || provider == "alioss"
if provider == "alioss"
options["provider"] = provider
options["access_key_id"] = l.p("#{scope}.aliyun_accesskey_id")
options["access_key_secret"] = l.p("#{scope}.aliyun_accesskey_secret")
Expand Down
4 changes: 1 addition & 3 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 @@ -79,9 +79,7 @@ if provider == "AWS" || provider == "s3"
add_optional(options, "multipart_copy_part_size", l.p("#{scope}.multipart_copy_part_size", nil))
end

# Support both native storage-cli types (alioss) AND legacy fog names (aliyun)
# Legacy fog name support to be REMOVED May 2026
if provider == "aliyun" || provider == "alioss"
if provider == "alioss"
options["provider"] = provider
options["access_key_id"] = l.p("#{scope}.aliyun_accesskey_id")
options["access_key_secret"] = l.p("#{scope}.aliyun_accesskey_secret")
Expand Down
4 changes: 1 addition & 3 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 @@ -79,9 +79,7 @@ if provider == "AWS" || provider == "s3"
add_optional(options, "multipart_copy_part_size", l.p("#{scope}.multipart_copy_part_size", nil))
end

# Support both native storage-cli types (alioss) AND legacy fog names (aliyun)
# Legacy fog name support to be REMOVED May 2026
if provider == "aliyun" || provider == "alioss"
if provider == "alioss"
options["provider"] = provider
options["access_key_id"] = l.p("#{scope}.aliyun_accesskey_id")
options["access_key_secret"] = l.p("#{scope}.aliyun_accesskey_secret")
Expand Down
4 changes: 1 addition & 3 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 @@ -79,9 +79,7 @@ if provider == "AWS" || provider == "s3"
add_optional(options, "multipart_copy_part_size", l.p("#{scope}.multipart_copy_part_size", nil))
end

# Support both native storage-cli types (alioss) AND legacy fog names (aliyun)
# Legacy fog name support to be REMOVED May 2026
if provider == "aliyun" || provider == "alioss"
if provider == "alioss"
options["provider"] = provider
options["access_key_id"] = l.p("#{scope}.aliyun_accesskey_id")
options["access_key_secret"] = l.p("#{scope}.aliyun_accesskey_secret")
Expand Down
8 changes: 4 additions & 4 deletions jobs/cloud_controller_clock/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ properties:
description: "Storage Cli extra flags string"

cc.resource_pool.blobstore_provider:
description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs', 'dav'] (native) or ['AWS', 'aliyun', 'Google'] (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) or ['AWS', 'Google'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead."
default: ~
cc.resource_pool.connection_config:
description: "Storage CLI connection configuration"
Expand Down Expand Up @@ -239,7 +239,7 @@ properties:
default: ""

cc.packages.blobstore_provider:
description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs', 'dav'] (native) or ['AWS', 'aliyun', 'Google'] (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) or ['AWS', 'Google'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead."
default: ~
cc.packages.connection_config:
description: "Storage CLI connection configuration"
Expand Down Expand Up @@ -287,7 +287,7 @@ properties:
default: ""

cc.droplets.blobstore_provider:
description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs', 'dav'] (native) or ['AWS', 'aliyun', 'Google'] (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) or ['AWS', 'Google'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead."
default: ~
cc.droplets.connection_config:
description: "Storage CLI connection configuration"
Expand Down Expand Up @@ -332,7 +332,7 @@ properties:
default: ""

cc.buildpacks.blobstore_provider:
description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs', 'dav'] (native) or ['AWS', 'aliyun', 'Google'] (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) or ['AWS', 'Google'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead."
default: ~
cc.buildpacks.connection_config:
description: "Storage CLI connection configuration"
Expand Down
4 changes: 1 addition & 3 deletions jobs/cloud_controller_clock/templates/storage_cli_config_buildpacks.json.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,7 @@ if provider == "AWS" || provider == "s3"
add_optional(options, "multipart_copy_part_size", p("#{scope}.multipart_copy_part_size", nil))
end

# Support both native storage-cli types (alioss) AND legacy fog names (aliyun)
# Legacy fog name support to be REMOVED May 2026
if provider == "aliyun" || provider == "alioss"
if provider == "alioss"
options["provider"] = provider
options["access_key_id"] = p("#{scope}.aliyun_accesskey_id")
options["access_key_secret"] = p("#{scope}.aliyun_accesskey_secret")
Expand Down
4 changes: 1 addition & 3 deletions jobs/cloud_controller_clock/templates/storage_cli_config_droplets.json.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,7 @@ if provider == "AWS" || provider == "s3"
add_optional(options, "multipart_copy_part_size", p("#{scope}.multipart_copy_part_size", nil))
end

# Support both native storage-cli types (alioss) AND legacy fog names (aliyun)
# Legacy fog name support to be REMOVED May 2026
if provider == "aliyun" || provider == "alioss"
if provider == "alioss"
options["provider"] = provider
options["access_key_id"] = p("#{scope}.aliyun_accesskey_id")
options["access_key_secret"] = p("#{scope}.aliyun_accesskey_secret")
Expand Down
4 changes: 1 addition & 3 deletions jobs/cloud_controller_clock/templates/storage_cli_config_packages.json.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,7 @@ if provider == "AWS" || provider == "s3"
add_optional(options, "multipart_copy_part_size", p("#{scope}.multipart_copy_part_size", nil))
end

# Support both native storage-cli types (alioss) AND legacy fog names (aliyun)
# Legacy fog name support to be REMOVED May 2026
if provider == "aliyun" || provider == "alioss"
if provider == "alioss"
options["provider"] = provider
options["access_key_id"] = p("#{scope}.aliyun_accesskey_id")
options["access_key_secret"] = p("#{scope}.aliyun_accesskey_secret")
Expand Down
4 changes: 1 addition & 3 deletions jobs/cloud_controller_clock/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 @@ -77,9 +77,7 @@ if provider == "AWS" || provider == "s3"
add_optional(options, "multipart_copy_part_size", p("#{scope}.multipart_copy_part_size", nil))
end

# Support both native storage-cli types (alioss) AND legacy fog names (aliyun)
# Legacy fog name support to be REMOVED May 2026
if provider == "aliyun" || provider == "alioss"
if provider == "alioss"
options["provider"] = provider
options["access_key_id"] = p("#{scope}.aliyun_accesskey_id")
options["access_key_secret"] = p("#{scope}.aliyun_accesskey_secret")
Expand Down
11 changes: 4 additions & 7 deletions jobs/cloud_controller_ng/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ properties:
description: "Storage Cli extra flags string"

cc.resource_pool.blobstore_provider:
description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs', 'dav'] (native) or ['AWS', 'aliyun', 'Google'] (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) or ['AWS', 'Google'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead."
default: ~
cc.resource_pool.connection_config:
description: "Storage CLI connection configuration"
Expand Down Expand Up @@ -584,8 +584,7 @@ properties:
default: ""

cc.packages.blobstore_provider:
description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs'] (native) or ['AWS', 'aliyun', 'Google'] (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) or ['AWS', 'aliyun', 'Google'] (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) or ['AWS', 'Google'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead."
default: ~
cc.packages.connection_config:
description: "Storage CLI connection configuration"
Expand Down Expand Up @@ -638,8 +637,7 @@ properties:
default: ""

cc.droplets.blobstore_provider:
description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs'] (native) or ['AWS', 'aliyun', 'Google'] (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) or ['AWS', 'aliyun', 'Google'] (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) or ['AWS', 'Google'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead."
default: ~
cc.droplets.connection_config:
description: "Storage CLI connection configuration"
Expand Down Expand Up @@ -689,8 +687,7 @@ properties:
default: ""

cc.buildpacks.blobstore_provider:
description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs'] (native) or ['AWS', 'aliyun', 'Google'] (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) or ['AWS', 'aliyun', 'Google'] (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) or ['AWS', 'Google'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead."
default: ~
cc.buildpacks.connection_config:
description: "Storage CLI connection configuration"
Expand Down
15 changes: 4 additions & 11 deletions jobs/cloud_controller_ng/templates/bpm.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,10 @@ def mount_valkey_volume!(config)
end

def enable_fog_debugging!(config)
if p("cc.log_fog_requests")
case p("cc.packages.fog_connection.provider", "").downcase
when "aliyun"
config["env"]["ALIYUN_OSS_SDK_LOG_LEVEL"] = "debug"
config["env"]["FOG_DEBUG"] = true
config["env"]["DEBUG"] = true
else
config["env"]["DEBUG"] = true
config["env"]["FOG_DEBUG"] = true
end
end
if p("cc.log_fog_requests")
config["env"]["DEBUG"] = true
config["env"]["FOG_DEBUG"] = true
end
end

cloud_controller_ng_config = {
Expand Down
4 changes: 1 addition & 3 deletions jobs/cloud_controller_ng/templates/storage_cli_config_buildpacks.json.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,7 @@ if provider == "AWS" || provider == "s3"
add_optional(options, "multipart_copy_part_size", p("#{scope}.multipart_copy_part_size", nil))
end

# Support both native storage-cli types (alioss) AND legacy fog names (aliyun)
# Legacy fog name support to be REMOVED May 2026
if provider == "aliyun" || provider == "alioss"
if provider == "alioss"
options["provider"] = provider
options["access_key_id"] = p("#{scope}.aliyun_accesskey_id")
options["access_key_secret"] = p("#{scope}.aliyun_accesskey_secret")
Expand Down
4 changes: 1 addition & 3 deletions jobs/cloud_controller_ng/templates/storage_cli_config_droplets.json.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,7 @@ if provider == "AWS" || provider == "s3"
add_optional(options, "multipart_copy_part_size", p("#{scope}.multipart_copy_part_size", nil))
end

# Support both native storage-cli types (alioss) AND legacy fog names (aliyun)
# Legacy fog name support to be REMOVED May 2026
if provider == "aliyun" || provider == "alioss"
if provider == "alioss"
options["provider"] = provider
options["access_key_id"] = p("#{scope}.aliyun_accesskey_id")
options["access_key_secret"] = p("#{scope}.aliyun_accesskey_secret")
Expand Down
4 changes: 1 addition & 3 deletions jobs/cloud_controller_ng/templates/storage_cli_config_packages.json.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,7 @@ if provider == "AWS" || provider == "s3"
add_optional(options, "multipart_copy_part_size", p("#{scope}.multipart_copy_part_size", nil))
end

# Support both native storage-cli types (alioss) AND legacy fog names (aliyun)
# Legacy fog name support to be REMOVED May 2026
if provider == "aliyun" || provider == "alioss"
if provider == "alioss"
options["provider"] = provider
options["access_key_id"] = p("#{scope}.aliyun_accesskey_id")
options["access_key_secret"] = p("#{scope}.aliyun_accesskey_secret")
Expand Down
4 changes: 1 addition & 3 deletions jobs/cloud_controller_ng/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 @@ -77,9 +77,7 @@ if provider == "AWS" || provider == "s3"
add_optional(options, "multipart_copy_part_size", p("#{scope}.multipart_copy_part_size", nil))
end

# Support both native storage-cli types (alioss) AND legacy fog names (aliyun)
# Legacy fog name support to be REMOVED May 2026
if provider == "aliyun" || provider == "alioss"
if provider == "alioss"
options["provider"] = provider
options["access_key_id"] = p("#{scope}.aliyun_accesskey_id")
options["access_key_secret"] = p("#{scope}.aliyun_accesskey_secret")
Expand Down
8 changes: 4 additions & 4 deletions jobs/cloud_controller_worker/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ properties:
description: "Storage Cli extra flags string"

cc.resource_pool.blobstore_provider:
description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs', 'dav'] (native) or ['AWS', 'aliyun', 'Google'] (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) or ['AWS', 'Google'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead."
default: ~
cc.resource_pool.connection_config:
description: "Storage CLI connection configuration"
Expand Down Expand Up @@ -201,7 +201,7 @@ properties:
default: ""

cc.packages.blobstore_provider:
description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs', 'dav'] (native) or ['AWS', 'aliyun', 'Google'] (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) or ['AWS', 'Google'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead."
default: ~
cc.packages.connection_config:
description: "Storage CLI connection configuration"
Expand Down Expand Up @@ -249,7 +249,7 @@ properties:
default: ""

cc.droplets.blobstore_provider:
description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs', 'dav'] (native) or ['AWS', 'aliyun', 'Google'] (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) or ['AWS', 'Google'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead."
default: ~
cc.droplets.connection_config:
description: "Storage CLI connection configuration"
Expand Down Expand Up @@ -294,7 +294,7 @@ properties:
default: ""

cc.buildpacks.blobstore_provider:
description: "The provider of blobstore storage cli to use. Valid values: ['azurebs', 's3', 'alioss', 'gcs', 'dav'] (native) or ['AWS', 'aliyun', 'Google'] (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) or ['AWS', 'Google'] (legacy, to be removed May 2026). Note: 'AzureRM' is no longer a valid provider, use 'azurebs' instead."
default: ~
cc.buildpacks.connection_config:
description: "Storage CLI connection configuration"
Expand Down
13 changes: 3 additions & 10 deletions jobs/cloud_controller_worker/templates/bpm.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,9 @@ config = { "processes" => [] }
worker_config["env"]["NEWRELIC_ENABLE"] = true
end

if p("cc.log_fog_requests")
case p("cc.packages.fog_connection.provider", "").downcase
when "aliyun"
worker_config["env"]["ALIYUN_OSS_SDK_LOG_LEVEL"] = "debug"
worker_config["env"]["FOG_DEBUG"] = true
worker_config["env"]["DEBUG"] = true
else
worker_config["env"]["DEBUG"] = true
worker_config["env"]["FOG_DEBUG"] = true
end
if p("cc.log_fog_requests")
worker_config["env"]["DEBUG"] = true
worker_config["env"]["FOG_DEBUG"] = true
end

config["processes"] << worker_config
Expand Down
4 changes: 1 addition & 3 deletions jobs/cloud_controller_worker/templates/storage_cli_config_buildpacks.json.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,7 @@ if provider == "AWS" || provider == "s3"
add_optional(options, "multipart_copy_part_size", p("#{scope}.multipart_copy_part_size", nil))
end

# Support both native storage-cli types (alioss) AND legacy fog names (aliyun)
# Legacy fog name support to be REMOVED May 2026
if provider == "aliyun" || provider == "alioss"
if provider == "alioss"
options["provider"] = provider
options["access_key_id"] = p("#{scope}.aliyun_accesskey_id")
options["access_key_secret"] = p("#{scope}.aliyun_accesskey_secret")
Expand Down
Loading