aws: Cleanup exported concrete error types, only export error codes (a…

…ws#510)

CHANGELOG_PENDING.md

@@ -7,6 +7,7 @@ Breaking Change
 * `aws/external`: Removes several export constants and types ([#508](https://github.com/aws/aws-sdk-go-v2/pull/508))
   * No longer exports AWS environment constants used by the external environment configuration loader
   * `DefaultSharedConfigProfile` is now defined an exported constant
+* `aws`: `ErrMissingRegion`, `ErrMissingEndpoint`, `ErrStaticCredentialsEmpty` are now concrete error types ([#510](https://github.com/aws/aws-sdk-go-v2/pull/510))
 
 Services
 ---

aws/defaults/handlers.go

@@ -269,9 +269,9 @@ var RetryableCheckHandler = aws.NamedHandler{
 // region is not valid.
 var ValidateEndpointHandler = aws.NamedHandler{Name: "core.ValidateEndpointHandler", Fn: func(r *aws.Request) {
 	if r.Endpoint.SigningRegion == "" && r.Config.Region == "" {
-		r.Error = aws.ErrMissingRegion
+		r.Error = &aws.MissingRegionError{}
 	} else if len(r.Endpoint.URL) == 0 {
-		r.Error = aws.ErrMissingEndpoint
+		r.Error = &aws.MissingEndpointError{}
 	}
 }}
 

aws/defaults/handlers_test.go

@@ -56,8 +56,9 @@ func TestValidateEndpointHandlerErrorRegion(t *testing.T) {
 	if err == nil {
 		t.Errorf("expect error, got none")
 	}
-	if e, a := aws.ErrMissingRegion, err; e != a {
-		t.Errorf("expect %v to be %v", e, a)
+	var expected *aws.MissingRegionError
+	if !errors.As(err, &expected) {
+		t.Fatalf("expected %T, got %T", expected, err)
 	}
 }
 

aws/ec2metadata/api_client.go

@@ -234,6 +234,6 @@ func unmarshalError(r *aws.Request) {
 
 func validateEndpointHandler(r *aws.Request) {
 	if len(r.Endpoint.URL) == 0 {
-		r.Error = aws.ErrMissingEndpoint
+		r.Error = &aws.MissingEndpointError{}
 	}
 }

aws/endpointcreds/provider.go

@@ -150,7 +150,7 @@ func (p *Provider) getCredentials() (*getCredentialsOutput, error) {
 
 func validateEndpointHandler(r *aws.Request) {
 	if len(r.Endpoint.URL) == 0 {
-		r.Error = aws.ErrMissingEndpoint
+		r.Error = &aws.MissingEndpointError{}
 	}
 }
 

aws/errors.go

@@ -1,17 +1,15 @@
 package aws
 
-import "github.com/aws/aws-sdk-go-v2/aws/awserr"
+// MissingRegionError is an error that is returned if region configuration is not found.
+type MissingRegionError struct{}
 
-var (
-	// ErrMissingRegion is an error that is returned if region configuration is
-	// not found.
-	//
-	// @readonly
-	ErrMissingRegion = awserr.New("MissingRegion", "could not find region configuration", nil)
+func (*MissingRegionError) Error() string {
+	return "could not find region configuration"
+}
 
-	// ErrMissingEndpoint is an error that is returned if an endpoint cannot be
-	// resolved for a service.
-	//
-	// @readonly
-	ErrMissingEndpoint = awserr.New("MissingEndpoint", "'Endpoint' configuration is required for this service", nil)
-)
+// MissingEndpointError is an error that is returned if an endpoint cannot be resolved for a service.
+type MissingEndpointError struct{}
+
+func (*MissingEndpointError) Error() string {
+	return "'Endpoint' configuration is required for this service"
+}

aws/static_provider.go

@@ -2,17 +2,19 @@ package aws
 
 import (
 	"context"
+)
 
-	"github.com/aws/aws-sdk-go-v2/aws/awserr"
+const (
+	// StaticCredentialsProviderName provides a name of Static provider
+	StaticCredentialsProviderName = "StaticCredentialsProvider"
 )
 
-// StaticCredentialsProviderName provides a name of Static provider
-const StaticCredentialsProviderName = "StaticCredentialsProvider"
+// StaticCredentialsEmptyError is emitted when static credentials are empty.
+type StaticCredentialsEmptyError struct{}
 
-var (
-	// ErrStaticCredentialsEmpty is emitted when static credentials are empty.
-	ErrStaticCredentialsEmpty = awserr.New("EmptyStaticCreds", "static credentials are empty", nil)
-)
+func (*StaticCredentialsEmptyError) Error() string {
+	return "static credentials are empty"
+}
 
 // A StaticCredentialsProvider is a set of credentials which are set programmatically,
 // and will never expire.
@@ -33,10 +35,10 @@ func NewStaticCredentialsProvider(key, secret, session string) StaticCredentials
 }
 
 // Retrieve returns the credentials or error if the credentials are invalid.
-func (s StaticCredentialsProvider) Retrieve(ctx context.Context) (Credentials, error) {
+func (s StaticCredentialsProvider) Retrieve(_ context.Context) (Credentials, error) {
 	v := s.Value
 	if v.AccessKeyID == "" || v.SecretAccessKey == "" {
-		return Credentials{Source: StaticCredentialsProviderName}, ErrStaticCredentialsEmpty
+		return Credentials{Source: StaticCredentialsProviderName}, &StaticCredentialsEmptyError{}
 	}
 
 	if len(v.Source) == 0 {

service/cloudsearchdomain/customizations_test.go

@@ -1,6 +1,7 @@
 package cloudsearchdomain_test
 
 import (
+	"errors"
 	"testing"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
@@ -25,8 +26,9 @@ func TestRequireEndpointIfRegionProvided(t *testing.T) {
 	if err == nil {
 		t.Errorf("expect error, got none")
 	}
-	if e, a := aws.ErrMissingEndpoint, err; e != a {
-		t.Errorf("expect %v, got %v", e, a)
+	var expected *aws.MissingEndpointError
+	if !errors.As(err, &expected) {
+		t.Fatalf("expected %T, got %T", expected, err)
 	}
 }
 
@@ -45,8 +47,9 @@ func TestRequireEndpointIfNoRegionProvided(t *testing.T) {
 	if err == nil {
 		t.Errorf("expect error, got none")
 	}
-	if e, a := aws.ErrMissingEndpoint, err; e != a {
-		t.Errorf("expect %v, got %v", e, a)
+	var expected *aws.MissingEndpointError
+	if !errors.As(err, &expected) {
+		t.Fatalf("expected %T, got %T", expected, err)
 	}
 }
 

service/iotdataplane/customizations_test.go

@@ -1,6 +1,7 @@
 package iotdataplane_test
 
 import (
+	"errors"
 	"testing"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
@@ -24,8 +25,9 @@ func TestRequireEndpointIfRegionProvided(t *testing.T) {
 	if err == nil {
 		t.Errorf("expect error, got none")
 	}
-	if e, a := aws.ErrMissingEndpoint, err; e != a {
-		t.Errorf("expect %v, got %v", e, a)
+	var expected *aws.MissingEndpointError
+	if !errors.As(err, &expected) {
+		t.Fatalf("expected %T, got %T", expected, err)
 	}
 }
 
@@ -45,8 +47,9 @@ func TestRequireEndpointIfNoRegionProvided(t *testing.T) {
 	if err == nil {
 		t.Errorf("expect error, got none")
 	}
-	if e, a := aws.ErrMissingEndpoint, err; e != a {
-		t.Errorf("expect %v, got %v", e, a)
+	var expected *aws.MissingEndpointError
+	if !errors.As(err, &expected) {
+		t.Fatalf("expected %T, got %T", expected, err)
 	}
 }