Adds support for access-point and outposts for s3 / s3control client

service/internal/s3shared/arn_lookup.go

@@ -50,18 +50,18 @@ func (m *ARNLookup) HandleInitialize(ctx context.Context, in middleware.Initiali
 	return next.HandleInitialize(ctx, in)
 }
 
-// arnResourceValue is the key set on context used to identify, retrive an ARN resource
+// arnResourceKey is the key set on context used to identify, retrive an ARN resource
 // if present on the context.
-type arnResourceValue struct {
+type arnResourceKey struct {
 }
 
 // SetARNResourceOnContext sets arn on context
 func setARNResourceOnContext(ctx context.Context, value arn.ARN) context.Context {
-	return context.WithValue(ctx, arnResourceValue{}, value)
+	return context.WithValue(ctx, arnResourceKey{}, value)
 }
 
 // GetARNResourceFromContext returns an ARN from context and a bool indicating presence of ARN on ctx
 func GetARNResourceFromContext(ctx context.Context) (arn.ARN, bool) {
-	v, ok := ctx.Value(arnResourceValue{}).(arn.ARN)
+	v, ok := ctx.Value(arnResourceKey{}).(arn.ARN)
 	return v, ok
 }

service/internal/s3shared/endpoint_error.go

@@ -20,27 +20,27 @@ type InvalidARNError struct {
 	origErr  error
 }
 
-// Error returns the InvalidARNError
+// Code returns the invalid ARN error code
+func (e InvalidARNError) Code() string {
+	return invalidARNErrorErrCode
+}
+
+// Error returns the InvalidARN error string
 func (e InvalidARNError) Error() string {
 	var extra string
 	if e.resource != nil {
 		extra = "ARN: " + e.resource.String()
 	}
-	return (SprintError(e.Code(), e.Message(), extra, e.origErr))
-}
-
-// Code returns the invalid ARN error code
-func (e InvalidARNError) Code() string {
-	return invalidARNErrorErrCode
-}
+	msg := e.Code() + " : " + e.message
+	if extra != "" {
+		msg = msg + "\n\t" + extra
+	}
 
-// Message returns the message for Invalid ARN error
-func (e InvalidARNError) Message() string {
-	return e.message
+	return msg
 }
 
 // OrigErr is the original error wrapped by Invalid ARN Error
-func (e InvalidARNError) OrigErr() error {
+func (e InvalidARNError) Unwrap() error {
 	return e.origErr
 }
 
@@ -85,21 +85,20 @@ func (e ConfigurationError) Error() string {
 	extra := fmt.Sprintf("ARN: %s, client partition: %s, client region: %s",
 		e.resource, e.clientPartitionID, e.clientRegion)
 
-	return SprintError(e.Code(), e.Message(), extra, e.origErr)
+	msg := e.Code() + " : " + e.message
+	if extra != "" {
+		msg = msg + "\n\t" + extra
+	}
+	return msg
 }
 
 // Code returns configuration error's error-code
 func (e ConfigurationError) Code() string {
 	return configurationErrorErrCode
 }
 
-// Message returns the configuration error message
-func (e ConfigurationError) Message() string {
-	return e.message
-}
-
 // OrigErr is the original error wrapped by Configuration Error
-func (e ConfigurationError) OrigErr() error {
+func (e ConfigurationError) Unwrap() error {
 	return e.origErr
 }
 
@@ -179,16 +178,3 @@ func NewClientConfiguredForDualStackError(resource arn.Resource, clientPartition
 		clientRegion:      clientRegion,
 	}
 }
-
-// SprintError returns a formatted error message string
-func SprintError(code, message, extra string, origErr error) string {
-	msg := code + " : " + message
-	if extra != "" {
-		msg = msg + "\n\t" + extra
-	}
-	if origErr != nil {
-		// TODO: replace origErr to use %w
-		msg = msg + "\ncaused by: " + origErr.Error()
-	}
-	return msg
-}

service/internal/s3shared/metadata.go

@@ -0,0 +1,20 @@
+package s3shared
+
+import (
+	"context"
+)
+
+// clonedInputKey used to denote if request input was cloned.
+type clonedInputKey struct{}
+
+// SetClonedInputKey sets a key on context to denote input was cloned previously
+func SetClonedInputKey(ctx context.Context, value bool) context.Context {
+	return context.WithValue(ctx, clonedInputKey{}, value)
+}
+
+// IsClonedInput retrieves if context key for cloned input was set.
+// If set, we can infer that the reuqest input was cloned previously.
+func IsClonedInput(ctx context.Context) bool {
+	v, _ := ctx.Value(clonedInputKey{}).(bool)
+	return v
+}