fix(gensupport): cover ChunkRetryDeadline edge case (#1430)

tritone · web-flow · commit ef898456d145 · 2022-02-09T10:51:49.000-07:00
Fix an edge case that I noticed when testing a very small
ChunkRetryDeadline via the storage client. If the user
chooses a deadline too short to send a single request for the
chunk, we cause a failure so that resp and err are not
both nil.
diff --git a/internal/gensupport/resumable.go b/internal/gensupport/resumable.go
@@ -155,6 +155,12 @@ func (rx *ResumableUpload) Upload(ctx context.Context) (resp *http.Response, err
 			}
 			return nil, err
 		}
+		// This case is very unlikely but possible only if rx.ChunkRetryDeadline is
+		// set to a very small value, in which case no requests will be sent before
+		// the deadline. Return an error to avoid causing a panic.
+		if resp == nil {
+			return nil, fmt.Errorf("upload request to %v not sent, choose larger value for ChunkRetryDealine", rx.URI)
+		}
 		return resp, nil
 	}
 	// Configure retryable error criteria.

Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,12 @@ func (rx ResumableUpload) Upload(ctx context.Context) (resp http.Response, err`
`155`	`155`	`}`
`156`	`156`	`return nil, err`
`157`	`157`	`}`
	`158`	`+ // This case is very unlikely but possible only if rx.ChunkRetryDeadline is`
	`159`	`+ // set to a very small value, in which case no requests will be sent before`
	`160`	`+ // the deadline. Return an error to avoid causing a panic.`
	`161`	`+ if resp == nil {`
	`162`	`+ return nil, fmt.Errorf("upload request to %v not sent, choose larger value for ChunkRetryDealine", rx.URI)`
	`163`	`+ }`
`158`	`164`	`return resp, nil`
`159`	`165`	`}`
`160`	`166`	`// Configure retryable error criteria.`