Skip to content

Add native storage-cli type names support for blobstore providers #624

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 1 commit into from
Mar 13, 2026
Merged

Add native storage-cli type names support for blobstore providers #624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 14 additions & 5 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 @@ -25,7 +25,9 @@ scope = "cc.buildpacks.connection_config"
provider = l.p("cc.buildpacks.blobstore_provider", nil)
options = {}

if provider == "AzureRM"
# Support both native storage-cli types (azurebs) AND legacy fog names (AzureRM)
# Legacy fog name support to be REMOVED May 2026
if provider == "AzureRM" || provider == "azurebs"
options["provider"] = provider
options["account_name"] = l.p("#{scope}.azure_storage_account_name")
options["container_name"] = l.p("#{scope}.container_name")
Expand All @@ -35,7 +37,9 @@ if provider == "AzureRM"
options = cli_cfg_with_default_timeout(options, 'storage_cli')
end

if provider == "Google"
# Support both native storage-cli types (gcs) AND legacy fog names (Google)
# Legacy fog name support to be REMOVED May 2026
if provider == "Google" || provider == "gcs"
options["provider"] = provider
options["credentials_source"] = "static"
options["json_key"] = l.p("#{scope}.google_json_key_string")
Expand All @@ -44,7 +48,9 @@ if provider == "Google"
add_optional(options, "encryption_key", l.p("#{scope}.encryption_key", nil))
end

if provider == "AWS"
# 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"
options["provider"] = provider
options["access_key_id"] = l.p("#{scope}.aws_access_key_id")
options["secret_access_key"] = l.p("#{scope}.aws_secret_access_key")
Expand All @@ -71,15 +77,18 @@ if provider == "AWS"
add_optional(options, "multipart_copy_part_size", l.p("#{scope}.multipart_copy_part_size", nil))
end

if provider == "aliyun"
# 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"
options["provider"] = provider
options["access_key_id"] = l.p("#{scope}.aliyun_accesskey_id")
options["access_key_secret"] = l.p("#{scope}.aliyun_accesskey_secret")
options["endpoint"] = l.p("#{scope}.aliyun_oss_endpoint")
options["bucket_name"] = l.p("#{scope}.aliyun_oss_bucket")
end

if provider == "webdav"
# WebDAV/dav support intentionally excluded (not fully implemented)
if provider == "webdav" || provider == "dav"
options["provider"] = provider
options["user"] = l.p("#{scope}.username")
options["password"] = l.p("#{scope}.password")
Expand Down
19 changes: 14 additions & 5 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 @@ -25,7 +25,9 @@ scope = "cc.droplets.connection_config"
provider = l.p("cc.droplets.blobstore_provider", nil)
options = {}

if provider == "AzureRM"
# Support both native storage-cli types (azurebs) AND legacy fog names (AzureRM)
# Legacy fog name support to be REMOVED May 2026
if provider == "AzureRM" || provider == "azurebs"
options["provider"] = provider
options["account_name"] = l.p("#{scope}.azure_storage_account_name")
options["container_name"] = l.p("#{scope}.container_name")
Expand All @@ -35,7 +37,9 @@ if provider == "AzureRM"
options = cli_cfg_with_default_timeout(options, 'storage_cli')
end

if provider == "Google"
# Support both native storage-cli types (gcs) AND legacy fog names (Google)
# Legacy fog name support to be REMOVED May 2026
if provider == "Google" || provider == "gcs"
options["provider"] = provider
options["credentials_source"] = "static"
options["json_key"] = l.p("#{scope}.google_json_key_string")
Expand All @@ -44,7 +48,9 @@ if provider == "Google"
add_optional(options, "encryption_key", l.p("#{scope}.encryption_key", nil))
end

if provider == "AWS"
# 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"
options["provider"] = provider
options["access_key_id"] = l.p("#{scope}.aws_access_key_id")
options["secret_access_key"] = l.p("#{scope}.aws_secret_access_key")
Expand All @@ -71,15 +77,18 @@ if provider == "AWS"
add_optional(options, "multipart_copy_part_size", l.p("#{scope}.multipart_copy_part_size", nil))
end

if provider == "aliyun"
# 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"
options["provider"] = provider
options["access_key_id"] = l.p("#{scope}.aliyun_accesskey_id")
options["access_key_secret"] = l.p("#{scope}.aliyun_accesskey_secret")
options["endpoint"] = l.p("#{scope}.aliyun_oss_endpoint")
options["bucket_name"] = l.p("#{scope}.aliyun_oss_bucket")
end

if provider == "webdav"
# WebDAV/dav support intentionally excluded (not fully implemented)
if provider == "webdav" || provider == "dav"
options["provider"] = provider
options["user"] = l.p("#{scope}.username")
options["password"] = l.p("#{scope}.password")
Expand Down
19 changes: 14 additions & 5 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 @@ -25,7 +25,9 @@ scope = "cc.packages.connection_config"
provider = l.p("cc.packages.blobstore_provider", nil)
options = {}

if provider == "AzureRM"
# Support both native storage-cli types (azurebs) AND legacy fog names (AzureRM)
# Legacy fog name support to be REMOVED May 2026
if provider == "AzureRM" || provider == "azurebs"
options["provider"] = provider
options["account_name"] = l.p("#{scope}.azure_storage_account_name")
options["container_name"] = l.p("#{scope}.container_name")
Expand All @@ -35,7 +37,9 @@ if provider == "AzureRM"
options = cli_cfg_with_default_timeout(options, 'storage_cli')
end

if provider == "Google"
# Support both native storage-cli types (gcs) AND legacy fog names (Google)
# Legacy fog name support to be REMOVED May 2026
if provider == "Google" || provider == "gcs"
options["provider"] = provider
options["credentials_source"] = "static"
options["json_key"] = l.p("#{scope}.google_json_key_string")
Expand All @@ -44,7 +48,9 @@ if provider == "Google"
add_optional(options, "encryption_key", l.p("#{scope}.encryption_key", nil))
end

if provider == "AWS"
# 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"
options["provider"] = provider
options["access_key_id"] = l.p("#{scope}.aws_access_key_id")
options["secret_access_key"] = l.p("#{scope}.aws_secret_access_key")
Expand All @@ -71,15 +77,18 @@ if provider == "AWS"
add_optional(options, "multipart_copy_part_size", l.p("#{scope}.multipart_copy_part_size", nil))
end

if provider == "aliyun"
# 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"
options["provider"] = provider
options["access_key_id"] = l.p("#{scope}.aliyun_accesskey_id")
options["access_key_secret"] = l.p("#{scope}.aliyun_accesskey_secret")
options["endpoint"] = l.p("#{scope}.aliyun_oss_endpoint")
options["bucket_name"] = l.p("#{scope}.aliyun_oss_bucket")
end

if provider == "webdav"
# WebDAV/dav support intentionally excluded (not fully implemented)
if provider == "webdav" || provider == "dav"
options["provider"] = provider
options["user"] = l.p("#{scope}.username")
options["password"] = l.p("#{scope}.password")
Expand Down
19 changes: 14 additions & 5 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 @@ -25,7 +25,9 @@ scope = "cc.resource_pool.connection_config"
provider = l.p("cc.resource_pool.blobstore_provider", nil)
options = {}

if provider == "AzureRM"
# Support both native storage-cli types (azurebs) AND legacy fog names (AzureRM)
# Legacy fog name support to be REMOVED May 2026
if provider == "AzureRM" || provider == "azurebs"
options["provider"] = provider
options["account_name"] = l.p("#{scope}.azure_storage_account_name")
options["container_name"] = l.p("#{scope}.container_name")
Expand All @@ -35,7 +37,9 @@ if provider == "AzureRM"
options = cli_cfg_with_default_timeout(options, 'storage_cli')
end

if provider == "Google"
# Support both native storage-cli types (gcs) AND legacy fog names (Google)
# Legacy fog name support to be REMOVED May 2026
if provider == "Google" || provider == "gcs"
options["provider"] = provider
options["credentials_source"] = "static"
options["json_key"] = l.p("#{scope}.google_json_key_string")
Expand All @@ -44,7 +48,9 @@ if provider == "Google"
add_optional(options, "encryption_key", l.p("#{scope}.encryption_key", nil))
end

if provider == "AWS"
# 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"
options["provider"] = provider
options["access_key_id"] = l.p("#{scope}.aws_access_key_id")
options["secret_access_key"] = l.p("#{scope}.aws_secret_access_key")
Expand All @@ -71,15 +77,18 @@ if provider == "AWS"
add_optional(options, "multipart_copy_part_size", l.p("#{scope}.multipart_copy_part_size", nil))
end

if provider == "aliyun"
# 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"
options["provider"] = provider
options["access_key_id"] = l.p("#{scope}.aliyun_accesskey_id")
options["access_key_secret"] = l.p("#{scope}.aliyun_accesskey_secret")
options["endpoint"] = l.p("#{scope}.aliyun_oss_endpoint")
options["bucket_name"] = l.p("#{scope}.aliyun_oss_bucket")
end

if provider == "webdav"
# WebDAV/dav support intentionally excluded (not fully implemented)
if provider == "webdav" || provider == "dav"
options["provider"] = provider
options["user"] = l.p("#{scope}.username")
options["password"] = l.p("#{scope}.password")
Expand Down
19 changes: 14 additions & 5 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 @@ -25,7 +25,9 @@ scope = "cc.buildpacks.connection_config"
provider = l.p("cc.buildpacks.blobstore_provider", nil)
options = {}

if provider == "AzureRM"
# Support both native storage-cli types (azurebs) AND legacy fog names (AzureRM)
# Legacy fog name support to be REMOVED May 2026
if provider == "AzureRM" || provider == "azurebs"
options["provider"] = provider
options["account_name"] = l.p("#{scope}.azure_storage_account_name")
options["container_name"] = l.p("#{scope}.container_name")
Expand All @@ -35,7 +37,9 @@ if provider == "AzureRM"
options = cli_cfg_with_default_timeout(options, 'storage_cli')
end

if provider == "Google"
# Support both native storage-cli types (gcs) AND legacy fog names (Google)
# Legacy fog name support to be REMOVED May 2026
if provider == "Google" || provider == "gcs"
options["provider"] = provider
options["credentials_source"] = "static"
options["json_key"] = l.p("#{scope}.google_json_key_string")
Expand All @@ -44,7 +48,9 @@ if provider == "Google"
add_optional(options, "encryption_key", l.p("#{scope}.encryption_key", nil))
end

if provider == "AWS"
# 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"
options["provider"] = provider
options["access_key_id"] = l.p("#{scope}.aws_access_key_id")
options["secret_access_key"] = l.p("#{scope}.aws_secret_access_key")
Expand All @@ -71,15 +77,18 @@ if provider == "AWS"
add_optional(options, "multipart_copy_part_size", l.p("#{scope}.multipart_copy_part_size", nil))
end

if provider == "aliyun"
# 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"
options["provider"] = provider
options["access_key_id"] = l.p("#{scope}.aliyun_accesskey_id")
options["access_key_secret"] = l.p("#{scope}.aliyun_accesskey_secret")
options["endpoint"] = l.p("#{scope}.aliyun_oss_endpoint")
options["bucket_name"] = l.p("#{scope}.aliyun_oss_bucket")
end

if provider == "webdav"
# WebDAV/dav support intentionally excluded (not fully implemented)
if provider == "webdav" || provider == "dav"
options["provider"] = provider
options["user"] = l.p("#{scope}.username")
options["password"] = l.p("#{scope}.password")
Expand Down
19 changes: 14 additions & 5 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 @@ -25,7 +25,9 @@ scope = "cc.droplets.connection_config"
provider = l.p("cc.droplets.blobstore_provider", nil)
options = {}

if provider == "AzureRM"
# Support both native storage-cli types (azurebs) AND legacy fog names (AzureRM)
# Legacy fog name support to be REMOVED May 2026
if provider == "AzureRM" || provider == "azurebs"
options["provider"] = provider
options["account_name"] = l.p("#{scope}.azure_storage_account_name")
options["container_name"] = l.p("#{scope}.container_name")
Expand All @@ -35,7 +37,9 @@ if provider == "AzureRM"
options = cli_cfg_with_default_timeout(options, 'storage_cli')
end

if provider == "Google"
# Support both native storage-cli types (gcs) AND legacy fog names (Google)
# Legacy fog name support to be REMOVED May 2026
if provider == "Google" || provider == "gcs"
options["provider"] = provider
options["credentials_source"] = "static"
options["json_key"] = l.p("#{scope}.google_json_key_string")
Expand All @@ -44,7 +48,9 @@ if provider == "Google"
add_optional(options, "encryption_key", l.p("#{scope}.encryption_key", nil))
end

if provider == "AWS"
# 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"
options["provider"] = provider
options["access_key_id"] = l.p("#{scope}.aws_access_key_id")
options["secret_access_key"] = l.p("#{scope}.aws_secret_access_key")
Expand All @@ -71,15 +77,18 @@ if provider == "AWS"
add_optional(options, "multipart_copy_part_size", l.p("#{scope}.multipart_copy_part_size", nil))
end

if provider == "aliyun"
# 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"
options["provider"] = provider
options["access_key_id"] = l.p("#{scope}.aliyun_accesskey_id")
options["access_key_secret"] = l.p("#{scope}.aliyun_accesskey_secret")
options["endpoint"] = l.p("#{scope}.aliyun_oss_endpoint")
options["bucket_name"] = l.p("#{scope}.aliyun_oss_bucket")
end

if provider == "webdav"
# WebDAV/dav support intentionally excluded (not fully implemented)
if provider == "webdav" || provider == "dav"
options["provider"] = provider
options["user"] = l.p("#{scope}.username")
options["password"] = l.p("#{scope}.password")
Expand Down
19 changes: 14 additions & 5 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 @@ -25,7 +25,9 @@ scope = "cc.packages.connection_config"
provider = l.p("cc.packages.blobstore_provider", nil)
options = {}

if provider == "AzureRM"
# Support both native storage-cli types (azurebs) AND legacy fog names (AzureRM)
# Legacy fog name support to be REMOVED May 2026
if provider == "AzureRM" || provider == "azurebs"
options["provider"] = provider
options["account_name"] = l.p("#{scope}.azure_storage_account_name")
options["container_name"] = l.p("#{scope}.container_name")
Expand All @@ -35,7 +37,9 @@ if provider == "AzureRM"
options = cli_cfg_with_default_timeout(options, 'storage_cli')
end

if provider == "Google"
# Support both native storage-cli types (gcs) AND legacy fog names (Google)
# Legacy fog name support to be REMOVED May 2026
if provider == "Google" || provider == "gcs"
options["provider"] = provider
options["credentials_source"] = "static"
options["json_key"] = l.p("#{scope}.google_json_key_string")
Expand All @@ -44,7 +48,9 @@ if provider == "Google"
add_optional(options, "encryption_key", l.p("#{scope}.encryption_key", nil))
end

if provider == "AWS"
# 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"
options["provider"] = provider
options["access_key_id"] = l.p("#{scope}.aws_access_key_id")
options["secret_access_key"] = l.p("#{scope}.aws_secret_access_key")
Expand All @@ -71,15 +77,18 @@ if provider == "AWS"
add_optional(options, "multipart_copy_part_size", l.p("#{scope}.multipart_copy_part_size", nil))
end

if provider == "aliyun"
# 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"
options["provider"] = provider
options["access_key_id"] = l.p("#{scope}.aliyun_accesskey_id")
options["access_key_secret"] = l.p("#{scope}.aliyun_accesskey_secret")
options["endpoint"] = l.p("#{scope}.aliyun_oss_endpoint")
options["bucket_name"] = l.p("#{scope}.aliyun_oss_bucket")
end

if provider == "webdav"
# WebDAV/dav support intentionally excluded (not fully implemented)
if provider == "webdav" || provider == "dav"
options["provider"] = provider
options["user"] = l.p("#{scope}.username")
options["password"] = l.p("#{scope}.password")
Expand Down
Loading