diff --git a/jobs/blobstore_benchmark/templates/storage_cli_config_buildpacks.json.erb b/jobs/blobstore_benchmark/templates/storage_cli_config_buildpacks.json.erb index f95c11c0bf..1c60dca5dd 100644 --- a/jobs/blobstore_benchmark/templates/storage_cli_config_buildpacks.json.erb +++ b/jobs/blobstore_benchmark/templates/storage_cli_config_buildpacks.json.erb @@ -32,6 +32,8 @@ 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)) + add_optional(options, "http_response_header_timeout", l.p("#{scope}.http_response_header_timeout", nil)) options = cli_cfg_with_default_timeout(options, 'storage_cli') end @@ -42,6 +44,8 @@ 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)) + add_optional(options, "http_response_header_timeout", l.p("#{scope}.http_response_header_timeout", nil)) end if provider == "s3" @@ -78,6 +82,8 @@ 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)) + add_optional(options, "http_response_header_timeout", l.p("#{scope}.http_response_header_timeout", nil)) end if provider == "alioss" @@ -86,6 +92,8 @@ 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)) + add_optional(options, "http_response_header_timeout", l.p("#{scope}.http_response_header_timeout", nil)) end diff --git a/jobs/blobstore_benchmark/templates/storage_cli_config_droplets.json.erb b/jobs/blobstore_benchmark/templates/storage_cli_config_droplets.json.erb index 32eec10a7f..7dcb734903 100644 --- a/jobs/blobstore_benchmark/templates/storage_cli_config_droplets.json.erb +++ b/jobs/blobstore_benchmark/templates/storage_cli_config_droplets.json.erb @@ -32,6 +32,8 @@ 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)) + add_optional(options, "http_response_header_timeout", l.p("#{scope}.http_response_header_timeout", nil)) options = cli_cfg_with_default_timeout(options, 'storage_cli') end @@ -42,6 +44,8 @@ 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)) + add_optional(options, "http_response_header_timeout", l.p("#{scope}.http_response_header_timeout", nil)) end if provider == "s3" @@ -78,6 +82,8 @@ 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)) + add_optional(options, "http_response_header_timeout", l.p("#{scope}.http_response_header_timeout", nil)) end if provider == "alioss" @@ -86,6 +92,8 @@ 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)) + add_optional(options, "http_response_header_timeout", l.p("#{scope}.http_response_header_timeout", nil)) end diff --git a/jobs/blobstore_benchmark/templates/storage_cli_config_packages.json.erb b/jobs/blobstore_benchmark/templates/storage_cli_config_packages.json.erb index 0121f7cfac..656b38e371 100644 --- a/jobs/blobstore_benchmark/templates/storage_cli_config_packages.json.erb +++ b/jobs/blobstore_benchmark/templates/storage_cli_config_packages.json.erb @@ -32,6 +32,8 @@ 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)) + add_optional(options, "http_response_header_timeout", l.p("#{scope}.http_response_header_timeout", nil)) options = cli_cfg_with_default_timeout(options, 'storage_cli') end @@ -42,6 +44,8 @@ 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)) + add_optional(options, "http_response_header_timeout", l.p("#{scope}.http_response_header_timeout", nil)) end if provider == "s3" @@ -78,6 +82,8 @@ 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)) + add_optional(options, "http_response_header_timeout", l.p("#{scope}.http_response_header_timeout", nil)) end if provider == "alioss" @@ -86,6 +92,8 @@ 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)) + add_optional(options, "http_response_header_timeout", l.p("#{scope}.http_response_header_timeout", nil)) end diff --git a/jobs/blobstore_benchmark/templates/storage_cli_config_resource_pool.json.erb b/jobs/blobstore_benchmark/templates/storage_cli_config_resource_pool.json.erb index 611f5a65a9..7f5db4361f 100644 --- a/jobs/blobstore_benchmark/templates/storage_cli_config_resource_pool.json.erb +++ b/jobs/blobstore_benchmark/templates/storage_cli_config_resource_pool.json.erb @@ -32,6 +32,8 @@ 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)) + add_optional(options, "http_response_header_timeout", l.p("#{scope}.http_response_header_timeout", nil)) options = cli_cfg_with_default_timeout(options, 'storage_cli') end @@ -42,6 +44,8 @@ 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)) + add_optional(options, "http_response_header_timeout", l.p("#{scope}.http_response_header_timeout", nil)) end if provider == "s3" @@ -78,6 +82,8 @@ 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)) + add_optional(options, "http_response_header_timeout", l.p("#{scope}.http_response_header_timeout", nil)) end if provider == "alioss" @@ -86,6 +92,8 @@ 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)) + add_optional(options, "http_response_header_timeout", l.p("#{scope}.http_response_header_timeout", nil)) end diff --git a/jobs/cc_deployment_updater/templates/storage_cli_config_buildpacks.json.erb b/jobs/cc_deployment_updater/templates/storage_cli_config_buildpacks.json.erb index 6408419a0a..1c60dca5dd 100644 --- a/jobs/cc_deployment_updater/templates/storage_cli_config_buildpacks.json.erb +++ b/jobs/cc_deployment_updater/templates/storage_cli_config_buildpacks.json.erb @@ -32,6 +32,8 @@ 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)) + add_optional(options, "http_response_header_timeout", l.p("#{scope}.http_response_header_timeout", nil)) options = cli_cfg_with_default_timeout(options, 'storage_cli') end @@ -42,6 +44,8 @@ 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)) + add_optional(options, "http_response_header_timeout", l.p("#{scope}.http_response_header_timeout", nil)) end if provider == "s3" @@ -78,6 +82,8 @@ 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)) + add_optional(options, "http_response_header_timeout", l.p("#{scope}.http_response_header_timeout", nil)) end if provider == "alioss" @@ -86,6 +92,8 @@ 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)) + add_optional(options, "http_response_header_timeout", l.p("#{scope}.http_response_header_timeout", nil)) end @@ -108,6 +116,6 @@ if provider == "dav" options["tls"]={"cert"=>{"ca"=>ca_cert}} end end - + -%> <%= JSON.pretty_generate(options) %> diff --git a/jobs/cc_deployment_updater/templates/storage_cli_config_droplets.json.erb b/jobs/cc_deployment_updater/templates/storage_cli_config_droplets.json.erb index 1bf0e501fa..7dcb734903 100644 --- a/jobs/cc_deployment_updater/templates/storage_cli_config_droplets.json.erb +++ b/jobs/cc_deployment_updater/templates/storage_cli_config_droplets.json.erb @@ -32,6 +32,8 @@ 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)) + add_optional(options, "http_response_header_timeout", l.p("#{scope}.http_response_header_timeout", nil)) options = cli_cfg_with_default_timeout(options, 'storage_cli') end @@ -42,6 +44,8 @@ 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)) + add_optional(options, "http_response_header_timeout", l.p("#{scope}.http_response_header_timeout", nil)) end if provider == "s3" @@ -78,6 +82,8 @@ 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)) + add_optional(options, "http_response_header_timeout", l.p("#{scope}.http_response_header_timeout", nil)) end if provider == "alioss" @@ -86,8 +92,10 @@ 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)) + add_optional(options, "http_response_header_timeout", l.p("#{scope}.http_response_header_timeout", nil)) end - + if provider == "dav" options["provider"] = "dav" diff --git a/jobs/cc_deployment_updater/templates/storage_cli_config_packages.json.erb b/jobs/cc_deployment_updater/templates/storage_cli_config_packages.json.erb index 0121f7cfac..656b38e371 100644 --- a/jobs/cc_deployment_updater/templates/storage_cli_config_packages.json.erb +++ b/jobs/cc_deployment_updater/templates/storage_cli_config_packages.json.erb @@ -32,6 +32,8 @@ 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)) + add_optional(options, "http_response_header_timeout", l.p("#{scope}.http_response_header_timeout", nil)) options = cli_cfg_with_default_timeout(options, 'storage_cli') end @@ -42,6 +44,8 @@ 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)) + add_optional(options, "http_response_header_timeout", l.p("#{scope}.http_response_header_timeout", nil)) end if provider == "s3" @@ -78,6 +82,8 @@ 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)) + add_optional(options, "http_response_header_timeout", l.p("#{scope}.http_response_header_timeout", nil)) end if provider == "alioss" @@ -86,6 +92,8 @@ 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)) + add_optional(options, "http_response_header_timeout", l.p("#{scope}.http_response_header_timeout", nil)) end diff --git a/jobs/cc_deployment_updater/templates/storage_cli_config_resource_pool.json.erb b/jobs/cc_deployment_updater/templates/storage_cli_config_resource_pool.json.erb index 576b988c15..7f5db4361f 100644 --- a/jobs/cc_deployment_updater/templates/storage_cli_config_resource_pool.json.erb +++ b/jobs/cc_deployment_updater/templates/storage_cli_config_resource_pool.json.erb @@ -32,6 +32,8 @@ 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)) + add_optional(options, "http_response_header_timeout", l.p("#{scope}.http_response_header_timeout", nil)) options = cli_cfg_with_default_timeout(options, 'storage_cli') end @@ -42,6 +44,8 @@ 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)) + add_optional(options, "http_response_header_timeout", l.p("#{scope}.http_response_header_timeout", nil)) end if provider == "s3" @@ -78,6 +82,8 @@ 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)) + add_optional(options, "http_response_header_timeout", l.p("#{scope}.http_response_header_timeout", nil)) end if provider == "alioss" @@ -86,8 +92,10 @@ 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)) + add_optional(options, "http_response_header_timeout", l.p("#{scope}.http_response_header_timeout", nil)) end - + if provider == "dav" options["provider"] = "dav" diff --git a/jobs/cloud_controller_clock/templates/storage_cli_config_buildpacks.json.erb b/jobs/cloud_controller_clock/templates/storage_cli_config_buildpacks.json.erb index 385eb20b4e..d1c1f6160f 100644 --- a/jobs/cloud_controller_clock/templates/storage_cli_config_buildpacks.json.erb +++ b/jobs/cloud_controller_clock/templates/storage_cli_config_buildpacks.json.erb @@ -30,6 +30,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) options = cli_cfg_with_default_timeout(options, 'storage_cli') end @@ -40,6 +42,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end if provider == "s3" @@ -76,6 +80,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end if provider == "alioss" @@ -84,6 +90,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end diff --git a/jobs/cloud_controller_clock/templates/storage_cli_config_droplets.json.erb b/jobs/cloud_controller_clock/templates/storage_cli_config_droplets.json.erb index 18e0edad73..91032c237e 100644 --- a/jobs/cloud_controller_clock/templates/storage_cli_config_droplets.json.erb +++ b/jobs/cloud_controller_clock/templates/storage_cli_config_droplets.json.erb @@ -30,6 +30,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) options = cli_cfg_with_default_timeout(options, 'storage_cli') end @@ -40,6 +42,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end if provider == "s3" @@ -76,6 +80,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end if provider == "alioss" @@ -84,6 +90,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end diff --git a/jobs/cloud_controller_clock/templates/storage_cli_config_packages.json.erb b/jobs/cloud_controller_clock/templates/storage_cli_config_packages.json.erb index a50cbfed28..85d811e6c0 100644 --- a/jobs/cloud_controller_clock/templates/storage_cli_config_packages.json.erb +++ b/jobs/cloud_controller_clock/templates/storage_cli_config_packages.json.erb @@ -30,6 +30,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) options = cli_cfg_with_default_timeout(options, 'storage_cli') end @@ -40,6 +42,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end if provider == "s3" @@ -76,6 +80,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end if provider == "alioss" @@ -84,6 +90,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end diff --git a/jobs/cloud_controller_clock/templates/storage_cli_config_resource_pool.json.erb b/jobs/cloud_controller_clock/templates/storage_cli_config_resource_pool.json.erb index e5cf0c3a1d..a1ff7eaac3 100644 --- a/jobs/cloud_controller_clock/templates/storage_cli_config_resource_pool.json.erb +++ b/jobs/cloud_controller_clock/templates/storage_cli_config_resource_pool.json.erb @@ -30,6 +30,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) options = cli_cfg_with_default_timeout(options, 'storage_cli') end @@ -40,6 +42,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end if provider == "s3" @@ -76,6 +80,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end if provider == "alioss" @@ -84,6 +90,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end diff --git a/jobs/cloud_controller_ng/templates/storage_cli_config_buildpacks.json.erb b/jobs/cloud_controller_ng/templates/storage_cli_config_buildpacks.json.erb index 385eb20b4e..d1c1f6160f 100644 --- a/jobs/cloud_controller_ng/templates/storage_cli_config_buildpacks.json.erb +++ b/jobs/cloud_controller_ng/templates/storage_cli_config_buildpacks.json.erb @@ -30,6 +30,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) options = cli_cfg_with_default_timeout(options, 'storage_cli') end @@ -40,6 +42,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end if provider == "s3" @@ -76,6 +80,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end if provider == "alioss" @@ -84,6 +90,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end diff --git a/jobs/cloud_controller_ng/templates/storage_cli_config_droplets.json.erb b/jobs/cloud_controller_ng/templates/storage_cli_config_droplets.json.erb index 18e0edad73..91032c237e 100644 --- a/jobs/cloud_controller_ng/templates/storage_cli_config_droplets.json.erb +++ b/jobs/cloud_controller_ng/templates/storage_cli_config_droplets.json.erb @@ -30,6 +30,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) options = cli_cfg_with_default_timeout(options, 'storage_cli') end @@ -40,6 +42,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end if provider == "s3" @@ -76,6 +80,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end if provider == "alioss" @@ -84,6 +90,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end diff --git a/jobs/cloud_controller_ng/templates/storage_cli_config_packages.json.erb b/jobs/cloud_controller_ng/templates/storage_cli_config_packages.json.erb index a50cbfed28..85d811e6c0 100644 --- a/jobs/cloud_controller_ng/templates/storage_cli_config_packages.json.erb +++ b/jobs/cloud_controller_ng/templates/storage_cli_config_packages.json.erb @@ -30,6 +30,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) options = cli_cfg_with_default_timeout(options, 'storage_cli') end @@ -40,6 +42,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end if provider == "s3" @@ -76,6 +80,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end if provider == "alioss" @@ -84,6 +90,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end diff --git a/jobs/cloud_controller_ng/templates/storage_cli_config_resource_pool.json.erb b/jobs/cloud_controller_ng/templates/storage_cli_config_resource_pool.json.erb index e5cf0c3a1d..a1ff7eaac3 100644 --- a/jobs/cloud_controller_ng/templates/storage_cli_config_resource_pool.json.erb +++ b/jobs/cloud_controller_ng/templates/storage_cli_config_resource_pool.json.erb @@ -30,6 +30,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) options = cli_cfg_with_default_timeout(options, 'storage_cli') end @@ -40,6 +42,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end if provider == "s3" @@ -76,6 +80,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end if provider == "alioss" @@ -84,6 +90,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end diff --git a/jobs/cloud_controller_worker/templates/storage_cli_config_buildpacks.json.erb b/jobs/cloud_controller_worker/templates/storage_cli_config_buildpacks.json.erb index 385eb20b4e..d1c1f6160f 100644 --- a/jobs/cloud_controller_worker/templates/storage_cli_config_buildpacks.json.erb +++ b/jobs/cloud_controller_worker/templates/storage_cli_config_buildpacks.json.erb @@ -30,6 +30,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) options = cli_cfg_with_default_timeout(options, 'storage_cli') end @@ -40,6 +42,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end if provider == "s3" @@ -76,6 +80,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end if provider == "alioss" @@ -84,6 +90,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end diff --git a/jobs/cloud_controller_worker/templates/storage_cli_config_droplets.json.erb b/jobs/cloud_controller_worker/templates/storage_cli_config_droplets.json.erb index 18e0edad73..91032c237e 100644 --- a/jobs/cloud_controller_worker/templates/storage_cli_config_droplets.json.erb +++ b/jobs/cloud_controller_worker/templates/storage_cli_config_droplets.json.erb @@ -30,6 +30,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) options = cli_cfg_with_default_timeout(options, 'storage_cli') end @@ -40,6 +42,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end if provider == "s3" @@ -76,6 +80,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end if provider == "alioss" @@ -84,6 +90,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end diff --git a/jobs/cloud_controller_worker/templates/storage_cli_config_packages.json.erb b/jobs/cloud_controller_worker/templates/storage_cli_config_packages.json.erb index 1ed409c78f..85d811e6c0 100644 --- a/jobs/cloud_controller_worker/templates/storage_cli_config_packages.json.erb +++ b/jobs/cloud_controller_worker/templates/storage_cli_config_packages.json.erb @@ -30,6 +30,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) options = cli_cfg_with_default_timeout(options, 'storage_cli') end @@ -40,6 +42,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end if provider == "s3" @@ -76,6 +80,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end if provider == "alioss" @@ -84,8 +90,10 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end - + if provider == "dav" options["provider"] = "dav" diff --git a/jobs/cloud_controller_worker/templates/storage_cli_config_resource_pool.json.erb b/jobs/cloud_controller_worker/templates/storage_cli_config_resource_pool.json.erb index 0d74c40a39..a1ff7eaac3 100644 --- a/jobs/cloud_controller_worker/templates/storage_cli_config_resource_pool.json.erb +++ b/jobs/cloud_controller_worker/templates/storage_cli_config_resource_pool.json.erb @@ -30,6 +30,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) options = cli_cfg_with_default_timeout(options, 'storage_cli') end @@ -40,6 +42,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end if provider == "s3" @@ -76,6 +80,8 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end if provider == "alioss" @@ -84,8 +90,10 @@ 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)) + add_optional(options, "http_response_header_timeout", p("#{scope}.http_response_header_timeout", nil)) end - + if provider == "dav" options["provider"] = "dav" diff --git a/spec/cc_deployment_updater/storage_cli_config_jsons_spec.rb b/spec/cc_deployment_updater/storage_cli_config_jsons_spec.rb index f7baa59475..954e4881d0 100644 --- a/spec/cc_deployment_updater/storage_cli_config_jsons_spec.rb +++ b/spec/cc_deployment_updater/storage_cli_config_jsons_spec.rb @@ -105,6 +105,29 @@ def props_for_provider(provider) json = YAML.safe_load(template.render(props, consumes: links)) expect(json['put_timeout_in_seconds']).to eq('7') end + + it 'includes http_request_timeout when provided' do + set(link_props, keypath, { + 'provider' => 'azurebs', + 'azure_storage_account_name' => 'acc', + 'azure_storage_access_key' => 'key', + 'container_name' => 'cont', + 'http_request_timeout' => '30s' + }) + json = YAML.safe_load(template.render(props, consumes: links)) + expect(json['http_request_timeout']).to eq('30s') + end + + it 'excludes http_request_timeout when not provided' do + set(link_props, keypath, { + 'provider' => 'azurebs', + 'azure_storage_account_name' => 'acc', + 'azure_storage_access_key' => 'key', + 'container_name' => 'cont' + }) + json = YAML.safe_load(template.render(props, consumes: links)) + expect(json).not_to have_key('http_request_timeout') + end end end end @@ -193,7 +216,8 @@ def props_for_provider(provider) 'single_upload_threshold' => 2048, 'request_checksum_calculation_enabled' => false, 'response_checksum_calculation_enabled' => false, - 'uploader_request_checksum_calculation_enabled' => false + 'uploader_request_checksum_calculation_enabled' => false, + 'http_request_timeout' => '30s' }) json = YAML.safe_load(template.render(props, consumes: links)) @@ -224,7 +248,8 @@ def props_for_provider(provider) 'single_upload_threshold' => 2048, 'request_checksum_calculation_enabled' => false, 'response_checksum_calculation_enabled' => false, - 'uploader_request_checksum_calculation_enabled' => false + 'uploader_request_checksum_calculation_enabled' => false, + 'http_request_timeout' => '30s' ) end end @@ -267,8 +292,8 @@ def props_for_provider(provider) 'bucket_name' => 'bucket', 'google_json_key_string' => '{}', 'storage_class' => 'STANDARD', - 'encryption_key' => 'key' - + 'encryption_key' => 'key', + 'http_request_timeout' => '30s' }) json = YAML.safe_load(template.render(props, consumes: links)) @@ -278,7 +303,8 @@ def props_for_provider(provider) 'json_key' => '{}', 'credentials_source' => 'static', 'storage_class' => 'STANDARD', - 'encryption_key' => 'key' + 'encryption_key' => 'key', + 'http_request_timeout' => '30s' ) end end @@ -317,6 +343,19 @@ def props_for_provider(provider) 'bucket_name' => 'bucket' ) end + + it 'includes http_request_timeout when provided' do + set(link_props, keypath, { + 'provider' => 'alioss', + 'aliyun_accesskey_id' => 'key', + 'aliyun_accesskey_secret' => 'secret', + 'aliyun_oss_endpoint' => 'alioss.com', + 'aliyun_oss_bucket' => 'bucket', + 'http_request_timeout' => '30s' + }) + json = YAML.safe_load(template.render(props, consumes: links)) + expect(json).to include('http_request_timeout' => '30s') + end end end end diff --git a/spec/cloud_controller_clock/storage_cli_config_jsons_spec.rb b/spec/cloud_controller_clock/storage_cli_config_jsons_spec.rb index c28425a341..ca113bc7d9 100644 --- a/spec/cloud_controller_clock/storage_cli_config_jsons_spec.rb +++ b/spec/cloud_controller_clock/storage_cli_config_jsons_spec.rb @@ -90,6 +90,29 @@ def props_for_provider(provider) json = YAML.safe_load(template.render(props, consumes: links)) expect(json['put_timeout_in_seconds']).to eq('7') end + + it 'includes http_request_timeout when provided' do + set(props, keypath, { + 'provider' => 'azurebs', + 'azure_storage_account_name' => 'acc', + 'azure_storage_access_key' => 'key', + 'container_name' => 'cont', + 'http_request_timeout' => '30s' + }) + json = YAML.safe_load(template.render(props, consumes: links)) + expect(json['http_request_timeout']).to eq('30s') + end + + it 'excludes http_request_timeout when not provided' do + set(props, keypath, { + 'provider' => 'azurebs', + 'azure_storage_account_name' => 'acc', + 'azure_storage_access_key' => 'key', + 'container_name' => 'cont' + }) + json = YAML.safe_load(template.render(props, consumes: links)) + expect(json).not_to have_key('http_request_timeout') + end end end end @@ -170,7 +193,8 @@ def props_for_provider(provider) 'single_upload_threshold' => 2048, 'request_checksum_calculation_enabled' => false, 'response_checksum_calculation_enabled' => false, - 'uploader_request_checksum_calculation_enabled' => false + 'uploader_request_checksum_calculation_enabled' => false, + 'http_request_timeout' => '30s' }) json = YAML.safe_load(template.render(props, consumes: links)) @@ -201,7 +225,8 @@ def props_for_provider(provider) 'single_upload_threshold' => 2048, 'request_checksum_calculation_enabled' => false, 'response_checksum_calculation_enabled' => false, - 'uploader_request_checksum_calculation_enabled' => false + 'uploader_request_checksum_calculation_enabled' => false, + 'http_request_timeout' => '30s' ) end end @@ -236,8 +261,8 @@ def props_for_provider(provider) 'bucket_name' => 'bucket', 'google_json_key_string' => '{}', 'storage_class' => 'STANDARD', - 'encryption_key' => 'key' - + 'encryption_key' => 'key', + 'http_request_timeout' => '30s' }) json = YAML.safe_load(template.render(props, consumes: links)) @@ -247,7 +272,8 @@ def props_for_provider(provider) 'json_key' => '{}', 'credentials_source' => 'static', 'storage_class' => 'STANDARD', - 'encryption_key' => 'key' + 'encryption_key' => 'key', + 'http_request_timeout' => '30s' ) end end @@ -278,6 +304,19 @@ def props_for_provider(provider) 'bucket_name' => 'bucket' ) end + + it 'includes http_request_timeout when provided' do + set(props, keypath, { + 'provider' => 'alioss', + 'aliyun_accesskey_id' => 'key', + 'aliyun_accesskey_secret' => 'secret', + 'aliyun_oss_endpoint' => 'alioss.com', + 'aliyun_oss_bucket' => 'bucket', + 'http_request_timeout' => '30s' + }) + json = YAML.safe_load(template.render(props, consumes: links)) + expect(json).to include('http_request_timeout' => '30s') + end end end end diff --git a/spec/cloud_controller_ng/storage_cli_config_jsons_spec.rb b/spec/cloud_controller_ng/storage_cli_config_jsons_spec.rb index 05e253b2b7..4aa0522e18 100644 --- a/spec/cloud_controller_ng/storage_cli_config_jsons_spec.rb +++ b/spec/cloud_controller_ng/storage_cli_config_jsons_spec.rb @@ -90,6 +90,29 @@ def props_for_provider(provider) json = YAML.safe_load(template.render(props, consumes: links)) expect(json['put_timeout_in_seconds']).to eq('7') end + + it 'includes http_request_timeout when provided' do + set(props, keypath, { + 'provider' => 'azurebs', + 'azure_storage_account_name' => 'acc', + 'azure_storage_access_key' => 'key', + 'container_name' => 'cont', + 'http_request_timeout' => '30s' + }) + json = YAML.safe_load(template.render(props, consumes: links)) + expect(json['http_request_timeout']).to eq('30s') + end + + it 'excludes http_request_timeout when not provided' do + set(props, keypath, { + 'provider' => 'azurebs', + 'azure_storage_account_name' => 'acc', + 'azure_storage_access_key' => 'key', + 'container_name' => 'cont' + }) + json = YAML.safe_load(template.render(props, consumes: links)) + expect(json).not_to have_key('http_request_timeout') + end end end end @@ -170,7 +193,8 @@ def props_for_provider(provider) 'single_upload_threshold' => 2048, 'request_checksum_calculation_enabled' => false, 'response_checksum_calculation_enabled' => false, - 'uploader_request_checksum_calculation_enabled' => false + 'uploader_request_checksum_calculation_enabled' => false, + 'http_request_timeout' => '30s' }) json = YAML.safe_load(template.render(props, consumes: links)) @@ -201,7 +225,8 @@ def props_for_provider(provider) 'single_upload_threshold' => 2048, 'request_checksum_calculation_enabled' => false, 'response_checksum_calculation_enabled' => false, - 'uploader_request_checksum_calculation_enabled' => false + 'uploader_request_checksum_calculation_enabled' => false, + 'http_request_timeout' => '30s' ) end end @@ -236,8 +261,8 @@ def props_for_provider(provider) 'bucket_name' => 'bucket', 'google_json_key_string' => '{}', 'storage_class' => 'STANDARD', - 'encryption_key' => 'key' - + 'encryption_key' => 'key', + 'http_request_timeout' => '30s' }) json = YAML.safe_load(template.render(props, consumes: links)) @@ -247,7 +272,8 @@ def props_for_provider(provider) 'json_key' => '{}', 'credentials_source' => 'static', 'storage_class' => 'STANDARD', - 'encryption_key' => 'key' + 'encryption_key' => 'key', + 'http_request_timeout' => '30s' ) end end @@ -278,6 +304,19 @@ def props_for_provider(provider) 'bucket_name' => 'bucket' ) end + + it 'includes http_request_timeout when provided' do + set(props, keypath, { + 'provider' => 'alioss', + 'aliyun_accesskey_id' => 'key', + 'aliyun_accesskey_secret' => 'secret', + 'aliyun_oss_endpoint' => 'alioss.com', + 'aliyun_oss_bucket' => 'bucket', + 'http_request_timeout' => '30s' + }) + json = YAML.safe_load(template.render(props, consumes: links)) + expect(json).to include('http_request_timeout' => '30s') + end end end end diff --git a/spec/cloud_controller_worker/storage_cli_config_jsons_spec.rb b/spec/cloud_controller_worker/storage_cli_config_jsons_spec.rb index 2b60dddfab..7108c7b55b 100644 --- a/spec/cloud_controller_worker/storage_cli_config_jsons_spec.rb +++ b/spec/cloud_controller_worker/storage_cli_config_jsons_spec.rb @@ -90,6 +90,29 @@ def props_for_provider(provider) json = YAML.safe_load(template.render(props, consumes: links)) expect(json['put_timeout_in_seconds']).to eq('7') end + + it 'includes http_request_timeout when provided' do + set(props, keypath, { + 'provider' => 'azurebs', + 'azure_storage_account_name' => 'acc', + 'azure_storage_access_key' => 'key', + 'container_name' => 'cont', + 'http_request_timeout' => '30s' + }) + json = YAML.safe_load(template.render(props, consumes: links)) + expect(json['http_request_timeout']).to eq('30s') + end + + it 'excludes http_request_timeout when not provided' do + set(props, keypath, { + 'provider' => 'azurebs', + 'azure_storage_account_name' => 'acc', + 'azure_storage_access_key' => 'key', + 'container_name' => 'cont' + }) + json = YAML.safe_load(template.render(props, consumes: links)) + expect(json).not_to have_key('http_request_timeout') + end end end end @@ -170,7 +193,8 @@ def props_for_provider(provider) 'single_upload_threshold' => 2048, 'request_checksum_calculation_enabled' => false, 'response_checksum_calculation_enabled' => false, - 'uploader_request_checksum_calculation_enabled' => false + 'uploader_request_checksum_calculation_enabled' => false, + 'http_request_timeout' => '30s' }) json = YAML.safe_load(template.render(props, consumes: links)) @@ -201,7 +225,8 @@ def props_for_provider(provider) 'single_upload_threshold' => 2048, 'request_checksum_calculation_enabled' => false, 'response_checksum_calculation_enabled' => false, - 'uploader_request_checksum_calculation_enabled' => false + 'uploader_request_checksum_calculation_enabled' => false, + 'http_request_timeout' => '30s' ) end end @@ -236,8 +261,8 @@ def props_for_provider(provider) 'bucket_name' => 'bucket', 'google_json_key_string' => '{}', 'storage_class' => 'STANDARD', - 'encryption_key' => 'key' - + 'encryption_key' => 'key', + 'http_request_timeout' => '30s' }) json = YAML.safe_load(template.render(props, consumes: links)) @@ -247,7 +272,8 @@ def props_for_provider(provider) 'json_key' => '{}', 'credentials_source' => 'static', 'storage_class' => 'STANDARD', - 'encryption_key' => 'key' + 'encryption_key' => 'key', + 'http_request_timeout' => '30s' ) end end @@ -278,6 +304,19 @@ def props_for_provider(provider) 'bucket_name' => 'bucket' ) end + + it 'includes http_request_timeout when provided' do + set(props, keypath, { + 'provider' => 'alioss', + 'aliyun_accesskey_id' => 'key', + 'aliyun_accesskey_secret' => 'secret', + 'aliyun_oss_endpoint' => 'alioss.com', + 'aliyun_oss_bucket' => 'bucket', + 'http_request_timeout' => '30s' + }) + json = YAML.safe_load(template.render(props, consumes: links)) + expect(json).to include('http_request_timeout' => '30s') + end end end end