Skip to content

Commit 0ff830b

Browse files
authored
Remove fog-aliyun support (#660)
1 parent c00995d commit 0ff830b

30 files changed

Lines changed: 64 additions & 140 deletions

jobs/blobstore_benchmark/templates/storage_cli_config_buildpacks.json.erb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,7 @@ if provider == "AWS" || provider == "s3"
7979
add_optional(options, "multipart_copy_part_size", l.p("#{scope}.multipart_copy_part_size", nil))
8080
end
8181

82-
# Support both native storage-cli types (alioss) AND legacy fog names (aliyun)
83-
# Legacy fog name support to be REMOVED May 2026
84-
if provider == "aliyun" || provider == "alioss"
82+
if provider == "alioss"
8583
options["provider"] = provider
8684
options["access_key_id"] = l.p("#{scope}.aliyun_accesskey_id")
8785
options["access_key_secret"] = l.p("#{scope}.aliyun_accesskey_secret")

jobs/blobstore_benchmark/templates/storage_cli_config_droplets.json.erb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,7 @@ if provider == "AWS" || provider == "s3"
7979
add_optional(options, "multipart_copy_part_size", l.p("#{scope}.multipart_copy_part_size", nil))
8080
end
8181

82-
# Support both native storage-cli types (alioss) AND legacy fog names (aliyun)
83-
# Legacy fog name support to be REMOVED May 2026
84-
if provider == "aliyun" || provider == "alioss"
82+
if provider == "alioss"
8583
options["provider"] = provider
8684
options["access_key_id"] = l.p("#{scope}.aliyun_accesskey_id")
8785
options["access_key_secret"] = l.p("#{scope}.aliyun_accesskey_secret")

jobs/blobstore_benchmark/templates/storage_cli_config_packages.json.erb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,7 @@ if provider == "AWS" || provider == "s3"
7979
add_optional(options, "multipart_copy_part_size", l.p("#{scope}.multipart_copy_part_size", nil))
8080
end
8181

82-
# Support both native storage-cli types (alioss) AND legacy fog names (aliyun)
83-
# Legacy fog name support to be REMOVED May 2026
84-
if provider == "aliyun" || provider == "alioss"
82+
if provider == "alioss"
8583
options["provider"] = provider
8684
options["access_key_id"] = l.p("#{scope}.aliyun_accesskey_id")
8785
options["access_key_secret"] = l.p("#{scope}.aliyun_accesskey_secret")

jobs/blobstore_benchmark/templates/storage_cli_config_resource_pool.json.erb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,7 @@ if provider == "AWS" || provider == "s3"
7979
add_optional(options, "multipart_copy_part_size", l.p("#{scope}.multipart_copy_part_size", nil))
8080
end
8181

82-
# Support both native storage-cli types (alioss) AND legacy fog names (aliyun)
83-
# Legacy fog name support to be REMOVED May 2026
84-
if provider == "aliyun" || provider == "alioss"
82+
if provider == "alioss"
8583
options["provider"] = provider
8684
options["access_key_id"] = l.p("#{scope}.aliyun_accesskey_id")
8785
options["access_key_secret"] = l.p("#{scope}.aliyun_accesskey_secret")

jobs/cc_deployment_updater/templates/storage_cli_config_buildpacks.json.erb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,7 @@ if provider == "AWS" || provider == "s3"
7979
add_optional(options, "multipart_copy_part_size", l.p("#{scope}.multipart_copy_part_size", nil))
8080
end
8181

82-
# Support both native storage-cli types (alioss) AND legacy fog names (aliyun)
83-
# Legacy fog name support to be REMOVED May 2026
84-
if provider == "aliyun" || provider == "alioss"
82+
if provider == "alioss"
8583
options["provider"] = provider
8684
options["access_key_id"] = l.p("#{scope}.aliyun_accesskey_id")
8785
options["access_key_secret"] = l.p("#{scope}.aliyun_accesskey_secret")

jobs/cc_deployment_updater/templates/storage_cli_config_droplets.json.erb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,7 @@ if provider == "AWS" || provider == "s3"
7979
add_optional(options, "multipart_copy_part_size", l.p("#{scope}.multipart_copy_part_size", nil))
8080
end
8181

82-
# Support both native storage-cli types (alioss) AND legacy fog names (aliyun)
83-
# Legacy fog name support to be REMOVED May 2026
84-
if provider == "aliyun" || provider == "alioss"
82+
if provider == "alioss"
8583
options["provider"] = provider
8684
options["access_key_id"] = l.p("#{scope}.aliyun_accesskey_id")
8785
options["access_key_secret"] = l.p("#{scope}.aliyun_accesskey_secret")

jobs/cc_deployment_updater/templates/storage_cli_config_packages.json.erb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,7 @@ if provider == "AWS" || provider == "s3"
7979
add_optional(options, "multipart_copy_part_size", l.p("#{scope}.multipart_copy_part_size", nil))
8080
end
8181

82-
# Support both native storage-cli types (alioss) AND legacy fog names (aliyun)
83-
# Legacy fog name support to be REMOVED May 2026
84-
if provider == "aliyun" || provider == "alioss"
82+
if provider == "alioss"
8583
options["provider"] = provider
8684
options["access_key_id"] = l.p("#{scope}.aliyun_accesskey_id")
8785
options["access_key_secret"] = l.p("#{scope}.aliyun_accesskey_secret")

jobs/cc_deployment_updater/templates/storage_cli_config_resource_pool.json.erb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,7 @@ if provider == "AWS" || provider == "s3"
7979
add_optional(options, "multipart_copy_part_size", l.p("#{scope}.multipart_copy_part_size", nil))
8080
end
8181

82-
# Support both native storage-cli types (alioss) AND legacy fog names (aliyun)
83-
# Legacy fog name support to be REMOVED May 2026
84-
if provider == "aliyun" || provider == "alioss"
82+
if provider == "alioss"
8583
options["provider"] = provider
8684
options["access_key_id"] = l.p("#{scope}.aliyun_accesskey_id")
8785
options["access_key_secret"] = l.p("#{scope}.aliyun_accesskey_secret")

jobs/cloud_controller_clock/spec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ properties:
193193
description: "Storage Cli extra flags string"
194194

195195
cc.resource_pool.blobstore_provider:
196-
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."
196+
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."
197197
default: ~
198198
cc.resource_pool.connection_config:
199199
description: "Storage CLI connection configuration"
@@ -244,7 +244,7 @@ properties:
244244
default: ""
245245

246246
cc.packages.blobstore_provider:
247-
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."
247+
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."
248248
default: ~
249249
cc.packages.connection_config:
250250
description: "Storage CLI connection configuration"
@@ -292,7 +292,7 @@ properties:
292292
default: ""
293293

294294
cc.droplets.blobstore_provider:
295-
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."
295+
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."
296296
default: ~
297297
cc.droplets.connection_config:
298298
description: "Storage CLI connection configuration"
@@ -337,7 +337,7 @@ properties:
337337
default: ""
338338

339339
cc.buildpacks.blobstore_provider:
340-
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."
340+
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."
341341
default: ~
342342
cc.buildpacks.connection_config:
343343
description: "Storage CLI connection configuration"

jobs/cloud_controller_clock/templates/storage_cli_config_buildpacks.json.erb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,7 @@ if provider == "AWS" || provider == "s3"
7777
add_optional(options, "multipart_copy_part_size", p("#{scope}.multipart_copy_part_size", nil))
7878
end
7979

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

0 commit comments

Comments
 (0)