diff --git a/aws/defaults/handlers.go b/aws/defaults/handlers.go index 8ec8fec916d..1b3f047e1e5 100644 --- a/aws/defaults/handlers.go +++ b/aws/defaults/handlers.go @@ -179,7 +179,7 @@ func handleSendError(r *aws.Request, err error) { ctx := r.Context() select { case <-ctx.Done(): - r.Error = awserr.New(aws.CanceledErrorCode, + r.Error = awserr.New(aws.ErrCodeRequestCanceled, "request context canceled", ctx.Err()) r.Retryable = aws.Bool(false) default: @@ -207,7 +207,7 @@ var AfterRetryHandler = aws.NamedHandler{Name: "core.AfterRetryHandler", Fn: fun r.RetryDelay = r.RetryRules(r) if err := sdk.SleepWithContext(r.Context(), r.RetryDelay); err != nil { - r.Error = awserr.New(aws.CanceledErrorCode, + r.Error = awserr.New(aws.ErrCodeRequestCanceled, "request context canceled", err) r.Retryable = aws.Bool(false) return diff --git a/aws/defaults/handlers_test.go b/aws/defaults/handlers_test.go index 3b5632e2905..469409f20f5 100644 --- a/aws/defaults/handlers_test.go +++ b/aws/defaults/handlers_test.go @@ -145,7 +145,7 @@ func TestAfterRetryWithContextCanceled(t *testing.T) { aerr := req.Error.(awserr.Error) - if e, a := aws.CanceledErrorCode, aerr.Code(); e != a { + if e, a := aws.ErrCodeRequestCanceled, aerr.Code(); e != a { t.Errorf("expect %q, error code got %q", e, a) } } @@ -199,7 +199,7 @@ func TestSendWithContextCanceled(t *testing.T) { aerr := req.Error.(awserr.Error) - if e, a := aws.CanceledErrorCode, aerr.Code(); e != a { + if e, a := aws.ErrCodeRequestCanceled, aerr.Code(); e != a { t.Errorf("expect %q, error code got %q", e, a) } } diff --git a/aws/ec2metadata/service.go b/aws/ec2metadata/service.go index 80168d93112..5c0a7e69cde 100644 --- a/aws/ec2metadata/service.go +++ b/aws/ec2metadata/service.go @@ -59,7 +59,7 @@ func New(config aws.Config) *EC2Metadata { Name: defaults.SendHandler.Name, Fn: func(r *aws.Request) { r.Error = awserr.New( - aws.CanceledErrorCode, + aws.ErrCodeRequestCanceled, "EC2 IMDS access disabled via "+disableServiceEnvVar+" env var", nil) }, diff --git a/aws/ec2metadata/service_test.go b/aws/ec2metadata/service_test.go index f8642c0fa01..d5615309e3b 100644 --- a/aws/ec2metadata/service_test.go +++ b/aws/ec2metadata/service_test.go @@ -28,7 +28,7 @@ func TestClientDisableIMDS(t *testing.T) { } aerr := err.(awserr.Error) - if e, a := aws.CanceledErrorCode, aerr.Code(); e != a { + if e, a := aws.ErrCodeRequestCanceled, aerr.Code(); e != a { t.Errorf("expect %v error code, got %v", e, a) } if e, a := "AWS_EC2_METADATA_DISABLED", aerr.Message(); !strings.Contains(a, e) { diff --git a/aws/request.go b/aws/request.go index edadf0fe76a..bbb36dec694 100644 --- a/aws/request.go +++ b/aws/request.go @@ -26,10 +26,10 @@ const ( // during body reads. ErrCodeResponseTimeout = "ResponseTimeout" - // CanceledErrorCode is the error code that will be returned by an + // ErrCodeRequestCanceled is the error code that will be returned by an // API request that was canceled. Requests given a Context may // return this error when canceled. - CanceledErrorCode = "RequestCanceled" + ErrCodeRequestCanceled = "RequestCanceled" ) // A Request is the service request to be made. @@ -565,7 +565,7 @@ func shouldRetryCancel(r *Request) bool { timeoutErr := false errStr := r.Error.Error() if ok { - if awsErr.Code() == CanceledErrorCode { + if awsErr.Code() == ErrCodeRequestCanceled { return false } err := awsErr.OrigErr() diff --git a/aws/waiter.go b/aws/waiter.go index 5f25bc2053f..6e3f7e7b726 100644 --- a/aws/waiter.go +++ b/aws/waiter.go @@ -193,7 +193,7 @@ func (w Waiter) WaitWithContext(ctx Context) error { // Delay to wait before inspecting the resource again if err := sdk.SleepWithContext(ctx, w.Delay(attempt)); err != nil { - return awserr.New(CanceledErrorCode, "waiter context canceled", err) + return awserr.New(ErrCodeRequestCanceled, "waiter context canceled", err) } } diff --git a/aws/waiter_test.go b/aws/waiter_test.go index f69c9245c9a..8a80c24022d 100644 --- a/aws/waiter_test.go +++ b/aws/waiter_test.go @@ -523,7 +523,7 @@ func TestWaiter_WithContextCanceled(t *testing.T) { t.Fatalf("expect waiter to be canceled.") } aerr := err.(awserr.Error) - if e, a := aws.CanceledErrorCode, aerr.Code(); e != a { + if e, a := aws.ErrCodeRequestCanceled, aerr.Code(); e != a { t.Errorf("expect %q error code, got %q", e, a) } if e, a := 2, reqCount; e != a { diff --git a/example/aws/request/withContext/withContext.go b/example/aws/request/withContext/withContext.go index 1b21b416842..8dcf747f586 100644 --- a/example/aws/request/withContext/withContext.go +++ b/example/aws/request/withContext/withContext.go @@ -63,9 +63,9 @@ func main() { req.SetContext(ctx) if _, err := req.Send(); err != nil { - if aerr, ok := err.(awserr.Error); ok && aerr.Code() == request.CanceledErrorCode { + if aerr, ok := err.(awserr.Error); ok && aerr.Code() == request.ErrCodeRequestCanceled { // If the SDK can determine the request or retry delay was canceled - // by a context the CanceledErrorCode error code will be returned. + // by a context the ErrCodeRequestCanceled error code will be returned. fmt.Fprintf(os.Stderr, "upload canceled due to timeout, %v\n", err) } else { fmt.Fprintf(os.Stderr, "failed to upload object, %v\n", err) diff --git a/service/s3/s3crypto/decryption_client_test.go b/service/s3/s3crypto/decryption_client_test.go index 27481fde58b..554f29089b4 100644 --- a/service/s3/s3crypto/decryption_client_test.go +++ b/service/s3/s3crypto/decryption_client_test.go @@ -240,7 +240,7 @@ func TestGetObjectWithContext(t *testing.T) { t.Fatalf("expected error, did not get one") } aerr := err.(awserr.Error) - if e, a := aws.CanceledErrorCode, aerr.Code(); e != a { + if e, a := aws.ErrCodeRequestCanceled, aerr.Code(); e != a { t.Errorf("expected error code %q, got %q", e, a) } if e, a := "canceled", aerr.Message(); !strings.Contains(a, e) { diff --git a/service/s3/s3crypto/encryption_client_test.go b/service/s3/s3crypto/encryption_client_test.go index 813c249aae4..ca84c6e5b4c 100644 --- a/service/s3/s3crypto/encryption_client_test.go +++ b/service/s3/s3crypto/encryption_client_test.go @@ -103,7 +103,7 @@ func TestPutObjectWithContext(t *testing.T) { t.Fatalf("expected error, did not get one") } aerr := err.(awserr.Error) - if e, a := aws.CanceledErrorCode, aerr.Code(); e != a { + if e, a := aws.ErrCodeRequestCanceled, aerr.Code(); e != a { t.Errorf("expected error code %q, got %q", e, a) } if e, a := "canceled", aerr.Message(); !strings.Contains(a, e) { diff --git a/service/s3/s3manager/download_test.go b/service/s3/s3manager/download_test.go index e771df0cfb3..a721c84fe6a 100644 --- a/service/s3/s3manager/download_test.go +++ b/service/s3/s3manager/download_test.go @@ -537,7 +537,7 @@ func TestDownloadWithContextCanceled(t *testing.T) { t.Fatalf("expected error, did not get one") } aerr := err.(awserr.Error) - if e, a := request.CanceledErrorCode, aerr.Code(); e != a { + if e, a := request.ErrCodeRequestCanceled, aerr.Code(); e != a { t.Errorf("expected error code %q, got %q", e, a) } if e, a := "canceled", aerr.Message(); !strings.Contains(a, e) { diff --git a/service/s3/s3manager/upload_test.go b/service/s3/s3manager/upload_test.go index 427fa602900..c79e4f3f0a6 100644 --- a/service/s3/s3manager/upload_test.go +++ b/service/s3/s3manager/upload_test.go @@ -1006,7 +1006,7 @@ func TestUploadWithContextCanceled(t *testing.T) { t.Fatalf("expected error, did not get one") } aerr := err.(awserr.Error) - if e, a := request.CanceledErrorCode, aerr.Code(); e != a { + if e, a := request.ErrCodeRequestCanceled, aerr.Code(); e != a { t.Errorf("expected error code %q, got %q", e, a) } if e, a := "canceled", aerr.Message(); !strings.Contains(a, e) {