CFP-2843 Remove timeout setting again

Author: jochenehret

alioss/README.md

@@ -16,11 +16,11 @@ The AliOSS client requires a JSON configuration file with the following structur
   "access_key_secret":         "<string> (required)",
   "endpoint":                  "<string> (required)",
   "bucket_name":               "<string> (required)",
-  "http_request_timeout":      "<string duration> (default: '60s')"
+  "http_request_timeout":      "<string duration> (optional)"
 }
 ```
 
-Set `http_request_timeout` to `"0"` to disable the HTTP client timeout explicitly.
+If `http_request_timeout` is omitted (or set to `"0"`), the HTTP client timeout is left unset.
 
 **Usage examples:**
 ``` bash

alioss/config/config.go

@@ -18,8 +18,6 @@ type AliStorageConfig struct {
 
 var errorNonPositiveHTTPRequestTimeout = errors.New("http_request_timeout must be greater than 0")
 
-const defaultHTTPRequestTimeoutSeconds int64 = 60
-
 // NewFromReader returns a new ali-storage-cli configuration struct from the contents of reader.
 // reader.Read() is expected to return valid JSON
 func NewFromReader(reader io.Reader) (AliStorageConfig, error) {
@@ -43,7 +41,7 @@ func NewFromReader(reader io.Reader) (AliStorageConfig, error) {
 
 func (c AliStorageConfig) HTTPRequestTimeoutSeconds() (int64, error) {
 	if c.HTTPRequestTimeout == "" {
-		return defaultHTTPRequestTimeoutSeconds, nil
+		return 0, nil
 	}
 
 	if c.HTTPRequestTimeout == "0" {

alioss/config/config_test.go

@@ -49,7 +49,7 @@ var _ = Describe("Config", func() {
 		Expect(timeoutSeconds).To(Equal(int64(2)))
 	})
 
-	It("uses 60 seconds timeout when http_request_timeout is not provided", func() {
+	It("leaves timeout unset when http_request_timeout is not provided", func() {
 		configJson := []byte(`{"access_key_id": "foo_access_key_id",
 								"access_key_secret": "foo_access_key_secret",
 								"endpoint": "foo_endpoint",
@@ -62,7 +62,7 @@ var _ = Describe("Config", func() {
 		Expect(config.HTTPRequestTimeout).To(BeEmpty())
 		timeoutSeconds, err := config.HTTPRequestTimeoutSeconds()
 		Expect(err).ToNot(HaveOccurred())
-		Expect(timeoutSeconds).To(Equal(int64(60)))
+		Expect(timeoutSeconds).To(BeZero())
 	})
 
 	It("returns an error when http_request_timeout has invalid format", func() {

gcs/README.md

@@ -17,13 +17,13 @@ The GCS client requires a JSON configuration file.
   "credentials_source":     "<string> ['static'|'none'|""]",
   "json_key":               "<string> (required if credentials_source = 'static')",
   "storage_class":          "<string> (optional - default: 'STANDARD', check for more options=https://docs.cloud.google.com/storage/docs/storage-classes)",
-  "http_request_timeout":   "<string duration> (default: '60s')",
+  "http_request_timeout":   "<string duration> (optional)",
   "encryption_key":         "<string> (optional)",
   "uniform_bucket_level_access": "<boolean> (optional)"
 }
 ```
 
-Set `http_request_timeout` to `"0"` to disable the HTTP client timeout explicitly.
+If `http_request_timeout` is omitted (or set to `"0"`), the HTTP client timeout is left unset.
 
 ### Credentials Source Types
 * **"":** specifies that credentials should be detected. Application Default Credentials will be used if avaliable. A read-only client will be used otherwise.

gcs/config/config.go

@@ -87,8 +87,6 @@ var ErrWrongLengthEncryptionKey = errors.New("encryption_key not 32 bytes")
 // ErrNonPositiveHTTPRequestTimeout is returned when http_request_timeout is <= 0.
 var ErrNonPositiveHTTPRequestTimeout = errors.New("http_request_timeout must be greater than 0")
 
-const defaultHTTPRequestTimeout = 60 * time.Second
-
 // NewFromReader returns the new gcscli configuration struct from the
 // contents of the reader.
 //
@@ -131,7 +129,7 @@ func NewFromReader(reader io.Reader) (GCSCli, error) {
 
 func (c *GCSCli) HTTPRequestTimeoutValue() (time.Duration, error) {
 	if c.HTTPRequestTimeout == "" {
-		return defaultHTTPRequestTimeout, nil
+		return 0, nil
 	}
 
 	if c.HTTPRequestTimeout == "0" {

gcs/config/config_test.go

@@ -187,13 +187,13 @@ var _ = Describe("BlobstoreClient configuration", func() {
 		dummyJSONBytes := []byte(`{"bucket_name": "some-bucket"}`)
 		dummyJSONReader := bytes.NewReader(dummyJSONBytes)
 
-		It("uses the default timeout", func() {
+		It("leaves timeout unset", func() {
 			c, err := NewFromReader(dummyJSONReader)
 			Expect(err).To(BeNil())
 			Expect(c.HTTPRequestTimeout).To(BeEmpty())
 			requestTimeoutValue, err := c.HTTPRequestTimeoutValue()
 			Expect(err).To(BeNil())
-			Expect(requestTimeoutValue.Seconds()).To(Equal(60.0))
+			Expect(requestTimeoutValue).To(BeZero())
 		})
 	})
 

s3/README.md

@@ -21,7 +21,7 @@ The S3 client requires a JSON configuration file with the following structure:
   "port":                         <int> (optional),
   "ssl_verify_peer":              <bool> (optional - default: true),
   "use_ssl":                      <bool> (optional - default: true),
-  "http_request_timeout":         "<string duration> (default: '60s')",
+  "http_request_timeout":         "<string duration> (optional)",
   "signature_version":            "<string> (optional)",
   "server_side_encryption":       "<string> (optional)",
   "sse_kms_key_id":               "<string> (optional)",
@@ -38,7 +38,7 @@ The S3 client requires a JSON configuration file with the following structure:
 }
 ```
 
-Set `http_request_timeout` to `"0"` to disable the HTTP client timeout explicitly.
+If `http_request_timeout` is omitted (or set to `"0s"`), the HTTP client timeout is left unset.
 
 **Usage examples:**
 ```shell

s3/config/config.go

@@ -51,8 +51,6 @@ type S3Cli struct {
 }
 
 const (
-	defaultHTTPRequestTimeout = 60 * time.Second
-
 	// multipartCopyMinPartSize is the AWS minimum part size for multipart operations.
 	// Other providers may have different limits - users should consult their provider's documentation.
 	multipartCopyMinPartSize = 5 * 1024 * 1024 // 5MB - AWS minimum part size
@@ -267,7 +265,7 @@ func (c *S3Cli) ShouldDisableUploaderRequestChecksumCalculation() bool {
 
 func (c *S3Cli) HTTPRequestTimeoutValue() (time.Duration, error) {
 	if c.HTTPRequestTimeout == "" {
-		return defaultHTTPRequestTimeout, nil
+		return 0, nil
 	}
 
 	if _, err := strconv.ParseFloat(c.HTTPRequestTimeout, 64); err == nil {

s3/config/config_test.go

@@ -397,7 +397,7 @@ var _ = Describe("BlobstoreClient configuration", func() {
 	})
 
 	Describe("http_request_timeout", func() {
-		It("defaults to 60 seconds when not set", func() {
+		It("leaves timeout unset when not set", func() {
 			dummyJSONBytes := []byte(`{"access_key_id":"id","secret_access_key":"key","bucket_name":"some-bucket"}`)
 			dummyJSONReader := bytes.NewReader(dummyJSONBytes)
 
@@ -406,7 +406,7 @@ var _ = Describe("BlobstoreClient configuration", func() {
 			Expect(c.HTTPRequestTimeout).To(BeEmpty())
 			timeout, err := c.HTTPRequestTimeoutValue()
 			Expect(err).ToNot(HaveOccurred())
-			Expect(timeout.Seconds()).To(Equal(60.0))
+			Expect(timeout).To(BeZero())
 		})
 
 		It("parses a valid duration", func() {