Skip to content

Add "http_request_timeout" option to storage-cli "connection_config" parameter #680

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
jochenehret wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Add "http_request_timeout" option to storage-cli "connection_config" parameter #680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f23dad
Add "http_request_timeout" option to storage-cli "connection_config" …
jochenehret Aug 11, 2026
b2849c2
Add "http_request_timeout" option to "azurebs" connection_config
jochenehret Aug 14, 2026
3065819
Align storage-cli test descriptions
jochenehret Aug 14, 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: 4 additions & 0 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 @@ -32,6 +32,7 @@ if provider == "azurebs"
options["account_key"] = l.p("#{scope}.azure_storage_access_key")
add_optional(options, "environment", l.p("#{scope}.environment", "AzureCloud"))
add_optional(options, "put_timeout_in_seconds", l.p("#{scope}.put_timeout_in_seconds", nil))
add_optional(options, "http_request_timeout", l.p("#{scope}.http_request_timeout", nil))
options = cli_cfg_with_default_timeout(options, 'storage_cli')
end

Expand All @@ -42,6 +43,7 @@ if provider == "gcs"
options["bucket_name"] = l.p("#{scope}.bucket_name")
add_optional(options, "storage_class", l.p("#{scope}.storage_class", nil))
add_optional(options, "encryption_key", l.p("#{scope}.encryption_key", nil))
add_optional(options, "http_request_timeout", l.p("#{scope}.http_request_timeout", nil))
end

if provider == "s3"
Expand Down Expand Up @@ -77,6 +79,7 @@ if provider == "s3"
add_optional(options, "request_checksum_calculation_enabled", l.p("#{scope}.request_checksum_calculation_enabled", nil))
add_optional(options, "response_checksum_calculation_enabled", l.p("#{scope}.response_checksum_calculation_enabled", nil))
add_optional(options, "uploader_request_checksum_calculation_enabled", l.p("#{scope}.uploader_request_checksum_calculation_enabled", nil))
add_optional(options, "http_request_timeout", l.p("#{scope}.http_request_timeout", nil))
end

if provider == "alioss"
Expand All @@ -85,6 +88,7 @@ if provider == "alioss"
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")
add_optional(options, "http_request_timeout", l.p("#{scope}.http_request_timeout", nil))
end


Expand Down
4 changes: 4 additions & 0 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 @@ -32,6 +32,7 @@ if provider == "azurebs"
options["account_key"] = l.p("#{scope}.azure_storage_access_key")
add_optional(options, "environment", l.p("#{scope}.environment", "AzureCloud"))
add_optional(options, "put_timeout_in_seconds", l.p("#{scope}.put_timeout_in_seconds", nil))
add_optional(options, "http_request_timeout", l.p("#{scope}.http_request_timeout", nil))
options = cli_cfg_with_default_timeout(options, 'storage_cli')
end

Expand All @@ -42,6 +43,7 @@ if provider == "gcs"
options["bucket_name"] = l.p("#{scope}.bucket_name")
add_optional(options, "storage_class", l.p("#{scope}.storage_class", nil))
add_optional(options, "encryption_key", l.p("#{scope}.encryption_key", nil))
add_optional(options, "http_request_timeout", l.p("#{scope}.http_request_timeout", nil))
end

if provider == "s3"
Expand Down Expand Up @@ -77,6 +79,7 @@ if provider == "s3"
add_optional(options, "request_checksum_calculation_enabled", l.p("#{scope}.request_checksum_calculation_enabled", nil))
add_optional(options, "response_checksum_calculation_enabled", l.p("#{scope}.response_checksum_calculation_enabled", nil))
add_optional(options, "uploader_request_checksum_calculation_enabled", l.p("#{scope}.uploader_request_checksum_calculation_enabled", nil))
add_optional(options, "http_request_timeout", l.p("#{scope}.http_request_timeout", nil))
end

if provider == "alioss"
Expand All @@ -85,6 +88,7 @@ if provider == "alioss"
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")
add_optional(options, "http_request_timeout", l.p("#{scope}.http_request_timeout", nil))
end


Expand Down
4 changes: 4 additions & 0 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 @@ -32,6 +32,7 @@ if provider == "azurebs"
options["account_key"] = l.p("#{scope}.azure_storage_access_key")
add_optional(options, "environment", l.p("#{scope}.environment", "AzureCloud"))
add_optional(options, "put_timeout_in_seconds", l.p("#{scope}.put_timeout_in_seconds", nil))
add_optional(options, "http_request_timeout", l.p("#{scope}.http_request_timeout", nil))
options = cli_cfg_with_default_timeout(options, 'storage_cli')
end

Expand All @@ -42,6 +43,7 @@ if provider == "gcs"
options["bucket_name"] = l.p("#{scope}.bucket_name")
add_optional(options, "storage_class", l.p("#{scope}.storage_class", nil))
add_optional(options, "encryption_key", l.p("#{scope}.encryption_key", nil))
add_optional(options, "http_request_timeout", l.p("#{scope}.http_request_timeout", nil))
end

if provider == "s3"
Expand Down Expand Up @@ -77,6 +79,7 @@ if provider == "s3"
add_optional(options, "request_checksum_calculation_enabled", l.p("#{scope}.request_checksum_calculation_enabled", nil))
add_optional(options, "response_checksum_calculation_enabled", l.p("#{scope}.response_checksum_calculation_enabled", nil))
add_optional(options, "uploader_request_checksum_calculation_enabled", l.p("#{scope}.uploader_request_checksum_calculation_enabled", nil))
add_optional(options, "http_request_timeout", l.p("#{scope}.http_request_timeout", nil))
end

if provider == "alioss"
Expand All @@ -85,6 +88,7 @@ if provider == "alioss"
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")
add_optional(options, "http_request_timeout", l.p("#{scope}.http_request_timeout", nil))
end


Expand Down
4 changes: 4 additions & 0 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 @@ -32,6 +32,7 @@ if provider == "azurebs"
options["account_key"] = l.p("#{scope}.azure_storage_access_key")
add_optional(options, "environment", l.p("#{scope}.environment", "AzureCloud"))
add_optional(options, "put_timeout_in_seconds", l.p("#{scope}.put_timeout_in_seconds", nil))
add_optional(options, "http_request_timeout", l.p("#{scope}.http_request_timeout", nil))
options = cli_cfg_with_default_timeout(options, 'storage_cli')
end

Expand All @@ -42,6 +43,7 @@ if provider == "gcs"
options["bucket_name"] = l.p("#{scope}.bucket_name")
add_optional(options, "storage_class", l.p("#{scope}.storage_class", nil))
add_optional(options, "encryption_key", l.p("#{scope}.encryption_key", nil))
add_optional(options, "http_request_timeout", l.p("#{scope}.http_request_timeout", nil))
end

if provider == "s3"
Expand Down Expand Up @@ -77,6 +79,7 @@ if provider == "s3"
add_optional(options, "request_checksum_calculation_enabled", l.p("#{scope}.request_checksum_calculation_enabled", nil))
add_optional(options, "response_checksum_calculation_enabled", l.p("#{scope}.response_checksum_calculation_enabled", nil))
add_optional(options, "uploader_request_checksum_calculation_enabled", l.p("#{scope}.uploader_request_checksum_calculation_enabled", nil))
add_optional(options, "http_request_timeout", l.p("#{scope}.http_request_timeout", nil))
end

if provider == "alioss"
Expand All @@ -85,6 +88,7 @@ if provider == "alioss"
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")
add_optional(options, "http_request_timeout", l.p("#{scope}.http_request_timeout", nil))
end


Expand Down
6 changes: 5 additions & 1 deletion 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 @@ -32,6 +32,7 @@ if provider == "azurebs"
options["account_key"] = l.p("#{scope}.azure_storage_access_key")
add_optional(options, "environment", l.p("#{scope}.environment", "AzureCloud"))
add_optional(options, "put_timeout_in_seconds", l.p("#{scope}.put_timeout_in_seconds", nil))
add_optional(options, "http_request_timeout", l.p("#{scope}.http_request_timeout", nil))
options = cli_cfg_with_default_timeout(options, 'storage_cli')
end

Expand All @@ -42,6 +43,7 @@ if provider == "gcs"
options["bucket_name"] = l.p("#{scope}.bucket_name")
add_optional(options, "storage_class", l.p("#{scope}.storage_class", nil))
add_optional(options, "encryption_key", l.p("#{scope}.encryption_key", nil))
add_optional(options, "http_request_timeout", l.p("#{scope}.http_request_timeout", nil))
end

if provider == "s3"
Expand Down Expand Up @@ -77,6 +79,7 @@ if provider == "s3"
add_optional(options, "request_checksum_calculation_enabled", l.p("#{scope}.request_checksum_calculation_enabled", nil))
add_optional(options, "response_checksum_calculation_enabled", l.p("#{scope}.response_checksum_calculation_enabled", nil))
add_optional(options, "uploader_request_checksum_calculation_enabled", l.p("#{scope}.uploader_request_checksum_calculation_enabled", nil))
add_optional(options, "http_request_timeout", l.p("#{scope}.http_request_timeout", nil))
end

if provider == "alioss"
Expand All @@ -85,6 +88,7 @@ if provider == "alioss"
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")
add_optional(options, "http_request_timeout", l.p("#{scope}.http_request_timeout", nil))
end


Expand All @@ -107,6 +111,6 @@ if provider == "dav"
options["tls"]={"cert"=>{"ca"=>ca_cert}}
end
end

-%>
<%= JSON.pretty_generate(options) %>
6 changes: 5 additions & 1 deletion 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 @@ -32,6 +32,7 @@ if provider == "azurebs"
options["account_key"] = l.p("#{scope}.azure_storage_access_key")
add_optional(options, "environment", l.p("#{scope}.environment", "AzureCloud"))
add_optional(options, "put_timeout_in_seconds", l.p("#{scope}.put_timeout_in_seconds", nil))
add_optional(options, "http_request_timeout", l.p("#{scope}.http_request_timeout", nil))
options = cli_cfg_with_default_timeout(options, 'storage_cli')
end

Expand All @@ -42,6 +43,7 @@ if provider == "gcs"
options["bucket_name"] = l.p("#{scope}.bucket_name")
add_optional(options, "storage_class", l.p("#{scope}.storage_class", nil))
add_optional(options, "encryption_key", l.p("#{scope}.encryption_key", nil))
add_optional(options, "http_request_timeout", l.p("#{scope}.http_request_timeout", nil))
end

if provider == "s3"
Expand Down Expand Up @@ -77,6 +79,7 @@ if provider == "s3"
add_optional(options, "request_checksum_calculation_enabled", l.p("#{scope}.request_checksum_calculation_enabled", nil))
add_optional(options, "response_checksum_calculation_enabled", l.p("#{scope}.response_checksum_calculation_enabled", nil))
add_optional(options, "uploader_request_checksum_calculation_enabled", l.p("#{scope}.uploader_request_checksum_calculation_enabled", nil))
add_optional(options, "http_request_timeout", l.p("#{scope}.http_request_timeout", nil))
end

if provider == "alioss"
Expand All @@ -85,8 +88,9 @@ if provider == "alioss"
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")
add_optional(options, "http_request_timeout", l.p("#{scope}.http_request_timeout", nil))
end


if provider == "dav"
options["provider"] = "dav"
Expand Down
4 changes: 4 additions & 0 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 @@ -32,6 +32,7 @@ if provider == "azurebs"
options["account_key"] = l.p("#{scope}.azure_storage_access_key")
add_optional(options, "environment", l.p("#{scope}.environment", "AzureCloud"))
add_optional(options, "put_timeout_in_seconds", l.p("#{scope}.put_timeout_in_seconds", nil))
add_optional(options, "http_request_timeout", l.p("#{scope}.http_request_timeout", nil))
options = cli_cfg_with_default_timeout(options, 'storage_cli')
end

Expand All @@ -42,6 +43,7 @@ if provider == "gcs"
options["bucket_name"] = l.p("#{scope}.bucket_name")
add_optional(options, "storage_class", l.p("#{scope}.storage_class", nil))
add_optional(options, "encryption_key", l.p("#{scope}.encryption_key", nil))
add_optional(options, "http_request_timeout", l.p("#{scope}.http_request_timeout", nil))
end

if provider == "s3"
Expand Down Expand Up @@ -77,6 +79,7 @@ if provider == "s3"
add_optional(options, "request_checksum_calculation_enabled", l.p("#{scope}.request_checksum_calculation_enabled", nil))
add_optional(options, "response_checksum_calculation_enabled", l.p("#{scope}.response_checksum_calculation_enabled", nil))
add_optional(options, "uploader_request_checksum_calculation_enabled", l.p("#{scope}.uploader_request_checksum_calculation_enabled", nil))
add_optional(options, "http_request_timeout", l.p("#{scope}.http_request_timeout", nil))
end

if provider == "alioss"
Expand All @@ -85,6 +88,7 @@ if provider == "alioss"
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")
add_optional(options, "http_request_timeout", l.p("#{scope}.http_request_timeout", nil))
end


Expand Down
6 changes: 5 additions & 1 deletion 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 @@ -32,6 +32,7 @@ if provider == "azurebs"
options["account_key"] = l.p("#{scope}.azure_storage_access_key")
add_optional(options, "environment", l.p("#{scope}.environment", "AzureCloud"))
add_optional(options, "put_timeout_in_seconds", l.p("#{scope}.put_timeout_in_seconds", nil))
add_optional(options, "http_request_timeout", l.p("#{scope}.http_request_timeout", nil))
options = cli_cfg_with_default_timeout(options, 'storage_cli')
end

Expand All @@ -42,6 +43,7 @@ if provider == "gcs"
options["bucket_name"] = l.p("#{scope}.bucket_name")
add_optional(options, "storage_class", l.p("#{scope}.storage_class", nil))
add_optional(options, "encryption_key", l.p("#{scope}.encryption_key", nil))
add_optional(options, "http_request_timeout", l.p("#{scope}.http_request_timeout", nil))
end

if provider == "s3"
Expand Down Expand Up @@ -77,6 +79,7 @@ if provider == "s3"
add_optional(options, "request_checksum_calculation_enabled", l.p("#{scope}.request_checksum_calculation_enabled", nil))
add_optional(options, "response_checksum_calculation_enabled", l.p("#{scope}.response_checksum_calculation_enabled", nil))
add_optional(options, "uploader_request_checksum_calculation_enabled", l.p("#{scope}.uploader_request_checksum_calculation_enabled", nil))
add_optional(options, "http_request_timeout", l.p("#{scope}.http_request_timeout", nil))
end

if provider == "alioss"
Expand All @@ -85,8 +88,9 @@ if provider == "alioss"
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")
add_optional(options, "http_request_timeout", l.p("#{scope}.http_request_timeout", nil))
end


if provider == "dav"
options["provider"] = "dav"
Expand Down
4 changes: 4 additions & 0 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 @@ -30,6 +30,7 @@ if provider == "azurebs"
options["account_key"] = p("#{scope}.azure_storage_access_key")
add_optional(options, "environment", p("#{scope}.environment", "AzureCloud"))
add_optional(options, "put_timeout_in_seconds", p("#{scope}.put_timeout_in_seconds", nil))
add_optional(options, "http_request_timeout", p("#{scope}.http_request_timeout", nil))
options = cli_cfg_with_default_timeout(options, 'storage_cli')
end

Expand All @@ -40,6 +41,7 @@ if provider == "gcs"
options["bucket_name"] = p("#{scope}.bucket_name")
add_optional(options, "storage_class", p("#{scope}.storage_class", nil))
add_optional(options, "encryption_key", p("#{scope}.encryption_key", nil))
add_optional(options, "http_request_timeout", p("#{scope}.http_request_timeout", nil))
end

if provider == "s3"
Expand Down Expand Up @@ -75,6 +77,7 @@ if provider == "s3"
add_optional(options, "request_checksum_calculation_enabled", p("#{scope}.request_checksum_calculation_enabled", nil))
add_optional(options, "response_checksum_calculation_enabled", p("#{scope}.response_checksum_calculation_enabled", nil))
add_optional(options, "uploader_request_checksum_calculation_enabled", p("#{scope}.uploader_request_checksum_calculation_enabled", nil))
add_optional(options, "http_request_timeout", p("#{scope}.http_request_timeout", nil))
end

if provider == "alioss"
Expand All @@ -83,6 +86,7 @@ if provider == "alioss"
options["access_key_secret"] = p("#{scope}.aliyun_accesskey_secret")
options["endpoint"] = p("#{scope}.aliyun_oss_endpoint")
options["bucket_name"] = p("#{scope}.aliyun_oss_bucket")
add_optional(options, "http_request_timeout", p("#{scope}.http_request_timeout", nil))
end


Expand Down
4 changes: 4 additions & 0 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 @@ -30,6 +30,7 @@ if provider == "azurebs"
options["account_key"] = p("#{scope}.azure_storage_access_key")
add_optional(options, "environment", p("#{scope}.environment", "AzureCloud"))
add_optional(options, "put_timeout_in_seconds", p("#{scope}.put_timeout_in_seconds", nil))
add_optional(options, "http_request_timeout", p("#{scope}.http_request_timeout", nil))
options = cli_cfg_with_default_timeout(options, 'storage_cli')
end

Expand All @@ -40,6 +41,7 @@ if provider == "gcs"
options["bucket_name"] = p("#{scope}.bucket_name")
add_optional(options, "storage_class", p("#{scope}.storage_class", nil))
add_optional(options, "encryption_key", p("#{scope}.encryption_key", nil))
add_optional(options, "http_request_timeout", p("#{scope}.http_request_timeout", nil))
end

if provider == "s3"
Expand Down Expand Up @@ -75,6 +77,7 @@ if provider == "s3"
add_optional(options, "request_checksum_calculation_enabled", p("#{scope}.request_checksum_calculation_enabled", nil))
add_optional(options, "response_checksum_calculation_enabled", p("#{scope}.response_checksum_calculation_enabled", nil))
add_optional(options, "uploader_request_checksum_calculation_enabled", p("#{scope}.uploader_request_checksum_calculation_enabled", nil))
add_optional(options, "http_request_timeout", p("#{scope}.http_request_timeout", nil))
end

if provider == "alioss"
Expand All @@ -83,6 +86,7 @@ if provider == "alioss"
options["access_key_secret"] = p("#{scope}.aliyun_accesskey_secret")
options["endpoint"] = p("#{scope}.aliyun_oss_endpoint")
options["bucket_name"] = p("#{scope}.aliyun_oss_bucket")
add_optional(options, "http_request_timeout", p("#{scope}.http_request_timeout", nil))
end


Expand Down
4 changes: 4 additions & 0 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 @@ -30,6 +30,7 @@ if provider == "azurebs"
options["account_key"] = p("#{scope}.azure_storage_access_key")
add_optional(options, "environment", p("#{scope}.environment", "AzureCloud"))
add_optional(options, "put_timeout_in_seconds", p("#{scope}.put_timeout_in_seconds", nil))
add_optional(options, "http_request_timeout", p("#{scope}.http_request_timeout", nil))
options = cli_cfg_with_default_timeout(options, 'storage_cli')
end

Expand All @@ -40,6 +41,7 @@ if provider == "gcs"
options["bucket_name"] = p("#{scope}.bucket_name")
add_optional(options, "storage_class", p("#{scope}.storage_class", nil))
add_optional(options, "encryption_key", p("#{scope}.encryption_key", nil))
add_optional(options, "http_request_timeout", p("#{scope}.http_request_timeout", nil))
end

if provider == "s3"
Expand Down Expand Up @@ -75,6 +77,7 @@ if provider == "s3"
add_optional(options, "request_checksum_calculation_enabled", p("#{scope}.request_checksum_calculation_enabled", nil))
add_optional(options, "response_checksum_calculation_enabled", p("#{scope}.response_checksum_calculation_enabled", nil))
add_optional(options, "uploader_request_checksum_calculation_enabled", p("#{scope}.uploader_request_checksum_calculation_enabled", nil))
add_optional(options, "http_request_timeout", p("#{scope}.http_request_timeout", nil))
end

if provider == "alioss"
Expand All @@ -83,6 +86,7 @@ if provider == "alioss"
options["access_key_secret"] = p("#{scope}.aliyun_accesskey_secret")
options["endpoint"] = p("#{scope}.aliyun_oss_endpoint")
options["bucket_name"] = p("#{scope}.aliyun_oss_bucket")
add_optional(options, "http_request_timeout", p("#{scope}.http_request_timeout", nil))
end


Expand Down
Loading