Merge pull request #1019 from aws/jasdel/fixup/ContextScopedStackValues

Updates SDK middleware values scoped to the stack being invoked
aws · Jan 8, 2021 · 292319d · 292319d
2 parents bcfdab3 + 2e09e62
commit 292319d
Show file tree

Hide file tree

Showing 818 changed files with 1,796 additions and 1,655 deletions.
diff --git a/.changes/next-release/sdk-feature-1609961868237777000.json b/.changes/next-release/sdk-feature-1609961868237777000.json
@@ -0,0 +1,9 @@
+{
+ "ID": "sdk-feature-1609961868237777000",
+ "SchemaVersion": 1,
+ "Module": "/",
+ "Type": "feature",
+ "Description": "Scope operation middleware values to the individual stack",
+ "MinVersion": "",
+ "AffectedModules": null
+}
diff --git a/.changes/next-release/service.internal.presign-url-feature-1609961884778858000.json b/.changes/next-release/service.internal.presign-url-feature-1609961884778858000.json
@@ -0,0 +1,9 @@
+{
+ "ID": "service.internal.presign-url-feature-1609961884778858000",
+ "SchemaVersion": 1,
+ "Module": "service/internal/presign-url",
+ "Type": "feature",
+ "Description": "Scope operation middleware values to the individual stack",
+ "MinVersion": "",
+ "AffectedModules": null
+}
diff --git a/.changes/next-release/service.internal.s3shared-feature-1609961900472000000.json b/.changes/next-release/service.internal.s3shared-feature-1609961900472000000.json
@@ -0,0 +1,9 @@
+{
+ "ID": "service.internal.s3shared-feature-1609961900472000000",
+ "SchemaVersion": 1,
+ "Module": "service/internal/s3shared",
+ "Type": "feature",
+ "Description": "Scope operation middleware values to the individual stack",
+ "MinVersion": "",
+ "AffectedModules": null
+}
diff --git a/aws/middleware/metadata.go b/aws/middleware/metadata.go
@@ -50,67 +50,103 @@ type (
 )
 
 // GetServiceID retrieves the service id from the context.
+//
+// Scoped to stack values. Use github.com/aws/smithy-go/middleware#ClearStackValues
+// to clear all stack values.
 func GetServiceID(ctx context.Context) (v string) {
-	v, _ = ctx.Value(serviceIDKey{}).(string)
+	v, _ = middleware.GetStackValue(ctx, serviceIDKey{}).(string)
 	return v
 }
 
 // GetSigningName retrieves the service signing name from the context.
+//
+// Scoped to stack values. Use github.com/aws/smithy-go/middleware#ClearStackValues
+// to clear all stack values.
 func GetSigningName(ctx context.Context) (v string) {
-	v, _ = ctx.Value(signingNameKey{}).(string)
+	v, _ = middleware.GetStackValue(ctx, signingNameKey{}).(string)
 	return v
 }
 
 // GetSigningRegion retrieves the region from the context.
+//
+// Scoped to stack values. Use github.com/aws/smithy-go/middleware#ClearStackValues
+// to clear all stack values.
 func GetSigningRegion(ctx context.Context) (v string) {
-	v, _ = ctx.Value(signingRegionKey{}).(string)
+	v, _ = middleware.GetStackValue(ctx, signingRegionKey{}).(string)
 	return v
 }
 
 // GetRegion retrieves the endpoint region from the context.
+//
+// Scoped to stack values. Use github.com/aws/smithy-go/middleware#ClearStackValues
+// to clear all stack values.
 func GetRegion(ctx context.Context) (v string) {
-	v, _ = ctx.Value(regionKey{}).(string)
+	v, _ = middleware.GetStackValue(ctx, regionKey{}).(string)
 	return v
 }
 
 // GetOperationName retrieves the service operation metadata from the context.
+//
+// Scoped to stack values. Use github.com/aws/smithy-go/middleware#ClearStackValues
+// to clear all stack values.
 func GetOperationName(ctx context.Context) (v string) {
-	v, _ = ctx.Value(operationNameKey{}).(string)
+	v, _ = middleware.GetStackValue(ctx, operationNameKey{}).(string)
 	return v
 }
 
 // GetPartitionID retrieves the endpoint partition id from the context.
+//
+// Scoped to stack values. Use github.com/aws/smithy-go/middleware#ClearStackValues
+// to clear all stack values.
 func GetPartitionID(ctx context.Context) string {
-	v, _ := ctx.Value(partitionIDKey{}).(string)
+	v, _ := middleware.GetStackValue(ctx, partitionIDKey{}).(string)
 	return v
 }
 
 // SetSigningName set or modifies the signing name on the context.
+//
+// Scoped to stack values. Use github.com/aws/smithy-go/middleware#ClearStackValues
+// to clear all stack values.
 func SetSigningName(ctx context.Context, value string) context.Context {
-	return context.WithValue(ctx, signingNameKey{}, value)
+	return middleware.WithStackValue(ctx, signingNameKey{}, value)
 }
 
 // SetSigningRegion sets or modifies the region on the context.
+//
+// Scoped to stack values. Use github.com/aws/smithy-go/middleware#ClearStackValues
+// to clear all stack values.
 func SetSigningRegion(ctx context.Context, value string) context.Context {
-	return context.WithValue(ctx, signingRegionKey{}, value)
+	return middleware.WithStackValue(ctx, signingRegionKey{}, value)
 }
 
 // SetServiceID sets the service id on the context.
+//
+// Scoped to stack values. Use github.com/aws/smithy-go/middleware#ClearStackValues
+// to clear all stack values.
 func SetServiceID(ctx context.Context, value string) context.Context {
-	return context.WithValue(ctx, serviceIDKey{}, value)
+	return middleware.WithStackValue(ctx, serviceIDKey{}, value)
 }
 
 // setRegion sets the endpoint region on the context.
+//
+// Scoped to stack values. Use github.com/aws/smithy-go/middleware#ClearStackValues
+// to clear all stack values.
 func setRegion(ctx context.Context, value string) context.Context {
-	return context.WithValue(ctx, regionKey{}, value)
+	return middleware.WithStackValue(ctx, regionKey{}, value)
 }
 
 // setOperationName sets the service operation on the context.
+//
+// Scoped to stack values. Use github.com/aws/smithy-go/middleware#ClearStackValues
+// to clear all stack values.
 func setOperationName(ctx context.Context, value string) context.Context {
-	return context.WithValue(ctx, operationNameKey{}, value)
+	return middleware.WithStackValue(ctx, operationNameKey{}, value)
 }
 
 // SetPartitionID sets the partition id of a resolved region on the context
+//
+// Scoped to stack values. Use github.com/aws/smithy-go/middleware#ClearStackValues
+// to clear all stack values.
 func SetPartitionID(ctx context.Context, value string) context.Context {
-	return context.WithValue(ctx, partitionIDKey{}, value)
+	return middleware.WithStackValue(ctx, partitionIDKey{}, value)
 }
diff --git a/aws/retry/middleware.go b/aws/retry/middleware.go
@@ -11,6 +11,7 @@ import (
 	awsmiddle "github.com/aws/aws-sdk-go-v2/aws/middleware"
 	"github.com/aws/aws-sdk-go-v2/internal/sdk"
 	"github.com/aws/smithy-go/logging"
+	"github.com/aws/smithy-go/middleware"
 	smithymiddle "github.com/aws/smithy-go/middleware"
 	"github.com/aws/smithy-go/transport/http"
 )
@@ -26,8 +27,6 @@ type retryMetadata struct {
 	AttemptClockSkew time.Duration
 }
 
-type retryMetadataKey struct{}
-
 // Attempt is a Smithy FinalizeMiddleware that handles retry attempts using the provided
 // Retryer implementation
 type Attempt struct {
@@ -191,14 +190,24 @@ func (r MetricsHeader) HandleFinalize(ctx context.Context, in smithymiddle.Final
 	return next.HandleFinalize(ctx, in)
 }
 
-// getRetryMetadata retrieves retryMetadata from the context and a bool indicating if it was set
+type retryMetadataKey struct{}
+
+// getRetryMetadata retrieves retryMetadata from the context and a bool
+// indicating if it was set.
+//
+// Scoped to stack values. Use github.com/aws/smithy-go/middleware#ClearStackValues
+// to clear all stack values.
 func getRetryMetadata(ctx context.Context) (metadata retryMetadata, ok bool) {
-	metadata, ok = ctx.Value(retryMetadataKey{}).(retryMetadata)
+	metadata, ok = middleware.GetStackValue(ctx, retryMetadataKey{}).(retryMetadata)
 	return metadata, ok
 }
 
+// setRetryMetadata sets the retryMetadata on the context.
+//
+// Scoped to stack values. Use github.com/aws/smithy-go/middleware#ClearStackValues
+// to clear all stack values.
 func setRetryMetadata(ctx context.Context, metadata retryMetadata) context.Context {
-	return context.WithValue(ctx, retryMetadataKey{}, metadata)
+	return middleware.WithStackValue(ctx, retryMetadataKey{}, metadata)
 }
 
 // AddRetryMiddlewaresOptions is the set of options that can be passed to AddRetryMiddlewares for configuring retry

diff --git a/aws/signer/v4/middleware.go b/aws/signer/v4/middleware.go
@@ -275,13 +275,18 @@ func haveCredentialProvider(p aws.CredentialsProvider) bool {
 type payloadHashKey struct{}
 
 // GetPayloadHash retrieves the payload hash to use for signing
+//
+// Scoped to stack values. Use github.com/aws/smithy-go/middleware#ClearStackValues
+// to clear all stack values.
 func GetPayloadHash(ctx context.Context) (v string) {
-	v, _ = ctx.Value(payloadHashKey{}).(string)
+	v, _ = middleware.GetStackValue(ctx, payloadHashKey{}).(string)
 	return v
 }
 
 // SetPayloadHash sets the payload hash to be used for signing the request
+//
+// Scoped to stack values. Use github.com/aws/smithy-go/middleware#ClearStackValues
+// to clear all stack values.
 func SetPayloadHash(ctx context.Context, hash string) context.Context {
-	ctx = context.WithValue(ctx, payloadHashKey{}, hash)
-	return ctx
+	return middleware.WithStackValue(ctx, payloadHashKey{}, hash)
 }
diff --git a/aws/signer/v4/middleware_test.go b/aws/signer/v4/middleware_test.go
@@ -52,8 +52,8 @@ func TestComputePayloadHashMiddleware(t *testing.T) {
 			c := &computePayloadSHA256{}
 
 			next := middleware.BuildHandlerFunc(func(ctx context.Context, in middleware.BuildInput) (out middleware.BuildOutput, metadata middleware.Metadata, err error) {
-				value, ok := ctx.Value(payloadHashKey{}).(string)
-				if !ok {
+				value := GetPayloadHash(ctx)
+				if len(value) == 0 {
 					t.Fatalf("expected payload hash value to be on context")
 				}
 				if e, a := tt.expectedHash, value; e != a {
@@ -175,7 +175,7 @@ func TestSignHTTPRequestMiddleware(t *testing.T) {
 			ctx = middleware.SetLogger(ctx, logger)
 
 			if len(tt.hash) != 0 {
-				ctx = context.WithValue(ctx, payloadHashKey{}, tt.hash)
+				ctx = SetPayloadHash(ctx, tt.hash)
 			}
 
 			_, _, err := c.HandleFinalize(ctx, middleware.FinalizeInput{

diff --git a/aws/signer/v4/presign_middleware_test.go b/aws/signer/v4/presign_middleware_test.go
@@ -181,7 +181,7 @@ func TestPresignHTTPRequestMiddleware(t *testing.T) {
 			ctx = middleware.SetLogger(ctx, logger)
 
 			if len(c.PayloadHash) != 0 {
-				ctx = context.WithValue(ctx, payloadHashKey{}, c.PayloadHash)
+				ctx = SetPayloadHash(ctx, c.PayloadHash)
 			}
 
 			result, _, err := m.HandleFinalize(ctx, middleware.FinalizeInput{

diff --git a/...y-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsGoDependency.java b/...y-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsGoDependency.java
@@ -84,6 +84,6 @@ protected static GoDependency module(
     }
 
     private static final class Versions {
-        private static final String AWS_SDK = "v0.31.1-0.20210105194811-58b543144e2a";
+        private static final String AWS_SDK = "v0.31.1-0.20210108183639-b6b5057e2ab1";
     }
 }
diff --git a/...src/main/java/software/amazon/smithy/aws/go/codegen/AwsHttpPresignURLClientGenerator.java b/...src/main/java/software/amazon/smithy/aws/go/codegen/AwsHttpPresignURLClientGenerator.java
@@ -232,10 +232,6 @@ private void writePresignOperationFunction(
                     writer.write("clientOptFns := append(options.ClientOptions, $L)", NOP_HTTP_CLIENT_OPTION_FUNC_NAME);
                     writer.write("");
 
-                    Symbol withIsPresigning = SymbolUtils.createValueSymbolBuilder("WithIsPresigning",
-                            AwsCustomGoDependency.PRESIGNEDURL_CUSTOMIZATION).build();
-
-                    writer.write("ctx = $T(ctx)", withIsPresigning);
                     writer.openBlock("result, _, err := c.client.invokeOperation(ctx, $S, params, clientOptFns,", ")",
                             operationSymbol.getName(), () -> {
                                 writer.write("$L,", OperationGenerator
@@ -385,6 +381,11 @@ private void writeConvertToPresignMiddleware(
                         writer.write("if err != nil { return err }");
                     }
 
+                    Symbol addAsPresignMiddlewareSymbol = SymbolUtils.createValueSymbolBuilder("AddAsIsPresigingMiddleware",
+                            AwsCustomGoDependency.PRESIGNEDURL_CUSTOMIZATION).build();
+                    writer.write("err = $T(stack)", addAsPresignMiddlewareSymbol);
+                    writer.write("if err != nil { return err }");
+
                     writer.write("return nil");
                 }).insertTrailingNewline();
     }

diff --git a/.../main/java/software/amazon/smithy/aws/go/codegen/customization/AwsCustomGoDependency.java b/.../main/java/software/amazon/smithy/aws/go/codegen/customization/AwsCustomGoDependency.java
@@ -48,8 +48,8 @@ private AwsCustomGoDependency() {
     }
 
     private static final class Versions {
-        private static final String INTERNAL_S3SHARED = "v0.4.0";
-        private static final String INTERNAL_ACCEPTENCODING = "v0.4.0";
-        private static final String INTERNAL_PRESIGNURL = "v0.2.0";
+        private static final String INTERNAL_S3SHARED = "v0.4.1-0.20210108183639-b6b5057e2ab1";
+        private static final String INTERNAL_ACCEPTENCODING = "v0.4.1-0.20210108183639-b6b5057e2ab1";
+        private static final String INTERNAL_PRESIGNURL = "v0.2.1-0.20210108183639-b6b5057e2ab1";
     }
 }
diff --git a/config/go.mod b/config/go.mod
@@ -3,11 +3,11 @@ module github.com/aws/aws-sdk-go-v2/config
 go 1.15
 
 require (
-	github.com/aws/aws-sdk-go-v2 v0.31.1-0.20210105194811-58b543144e2a
+	github.com/aws/aws-sdk-go-v2 v0.31.1-0.20210108183639-b6b5057e2ab1
 	github.com/aws/aws-sdk-go-v2/credentials v0.2.0
 	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v0.1.0
 	github.com/aws/aws-sdk-go-v2/service/sts v0.31.0
-	github.com/aws/smithy-go v0.5.1-0.20210104190327-c7045c94c1ec
+	github.com/aws/smithy-go v0.5.1-0.20210107224202-ae5323020d60
 	github.com/google/go-cmp v0.5.4
 )
 

diff --git a/config/go.sum b/config/go.sum
@@ -1,7 +1,6 @@
-github.com/aws/smithy-go v0.5.0 h1:ArsdWUrb1n6/V/REXhuwq2TZv+kuqOBpMlGBd2EkDYM=
-github.com/aws/smithy-go v0.5.0/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw=
-github.com/aws/smithy-go v0.5.1-0.20210104190327-c7045c94c1ec h1:M0qCoLoaSmEeGHQcjNx1pO94rSD+8X8jYvC03yYNAkU=
-github.com/aws/smithy-go v0.5.1-0.20210104190327-c7045c94c1ec/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw=
+github.com/aws/smithy-go v0.5.1-0.20210106170010-b13567a94b97/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw=
+github.com/aws/smithy-go v0.5.1-0.20210107224202-ae5323020d60 h1:ixWi1+ccMWnD0kGI/V4rsIG5nhRKhq1IEXLxBM3P75s=
+github.com/aws/smithy-go v0.5.1-0.20210107224202-ae5323020d60/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0=
 github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=

diff --git a/credentials/go.mod b/credentials/go.mod
@@ -3,10 +3,10 @@ module github.com/aws/aws-sdk-go-v2/credentials
 go 1.15
 
 require (
-	github.com/aws/aws-sdk-go-v2 v0.31.1-0.20210105194811-58b543144e2a
+	github.com/aws/aws-sdk-go-v2 v0.31.1-0.20210108183639-b6b5057e2ab1
 	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v0.1.0
 	github.com/aws/aws-sdk-go-v2/service/sts v0.31.0
-	github.com/aws/smithy-go v0.5.1-0.20210104190327-c7045c94c1ec
+	github.com/aws/smithy-go v0.5.1-0.20210107224202-ae5323020d60
 )
 
 replace (

diff --git a/credentials/go.sum b/credentials/go.sum
@@ -1,7 +1,6 @@
-github.com/aws/smithy-go v0.5.0 h1:ArsdWUrb1n6/V/REXhuwq2TZv+kuqOBpMlGBd2EkDYM=
-github.com/aws/smithy-go v0.5.0/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw=
-github.com/aws/smithy-go v0.5.1-0.20210104190327-c7045c94c1ec h1:M0qCoLoaSmEeGHQcjNx1pO94rSD+8X8jYvC03yYNAkU=
-github.com/aws/smithy-go v0.5.1-0.20210104190327-c7045c94c1ec/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw=
+github.com/aws/smithy-go v0.5.1-0.20210106170010-b13567a94b97/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw=
+github.com/aws/smithy-go v0.5.1-0.20210107224202-ae5323020d60 h1:ixWi1+ccMWnD0kGI/V4rsIG5nhRKhq1IEXLxBM3P75s=
+github.com/aws/smithy-go v0.5.1-0.20210107224202-ae5323020d60/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0=

diff --git a/example/service/s3/listObjects/go.sum b/example/service/s3/listObjects/go.sum
@@ -1,7 +1,8 @@
 github.com/aws/smithy-go v0.5.0 h1:ArsdWUrb1n6/V/REXhuwq2TZv+kuqOBpMlGBd2EkDYM=
 github.com/aws/smithy-go v0.5.0/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw=
-github.com/aws/smithy-go v0.5.1-0.20210104190327-c7045c94c1ec h1:M0qCoLoaSmEeGHQcjNx1pO94rSD+8X8jYvC03yYNAkU=
-github.com/aws/smithy-go v0.5.1-0.20210104190327-c7045c94c1ec/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw=
+github.com/aws/smithy-go v0.5.1-0.20210106170010-b13567a94b97/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw=
+github.com/aws/smithy-go v0.5.1-0.20210107224202-ae5323020d60 h1:ixWi1+ccMWnD0kGI/V4rsIG5nhRKhq1IEXLxBM3P75s=
+github.com/aws/smithy-go v0.5.1-0.20210107224202-ae5323020d60/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0=
 github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=

diff --git a/feature/cloudfront/sign/go.sum b/feature/cloudfront/sign/go.sum
@@ -1,5 +1,5 @@
-github.com/aws/smithy-go v0.5.0 h1:ArsdWUrb1n6/V/REXhuwq2TZv+kuqOBpMlGBd2EkDYM=
-github.com/aws/smithy-go v0.5.0/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw=
+github.com/aws/smithy-go v0.5.1-0.20210106170010-b13567a94b97 h1:CYur6TiTXgezWGjb91FvVZqbzMm9U7GyRX28Hx/MmsI=
+github.com/aws/smithy-go v0.5.1-0.20210106170010-b13567a94b97/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0=
 github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=

diff --git a/feature/dynamodb/attributevalue/go.mod b/feature/dynamodb/attributevalue/go.mod
@@ -3,7 +3,7 @@ module github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue
 go 1.15
 
 require (
-	github.com/aws/aws-sdk-go-v2 v0.31.1-0.20210105194811-58b543144e2a
+	github.com/aws/aws-sdk-go-v2 v0.31.1-0.20210108183639-b6b5057e2ab1
 	github.com/aws/aws-sdk-go-v2/service/dynamodb v0.31.0
 	github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v0.31.0
 	github.com/google/go-cmp v0.5.4

diff --git a/feature/dynamodb/attributevalue/go.sum b/feature/dynamodb/attributevalue/go.sum
@@ -1,7 +1,8 @@
 github.com/aws/smithy-go v0.5.0 h1:ArsdWUrb1n6/V/REXhuwq2TZv+kuqOBpMlGBd2EkDYM=
 github.com/aws/smithy-go v0.5.0/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw=
-github.com/aws/smithy-go v0.5.1-0.20210104190327-c7045c94c1ec h1:M0qCoLoaSmEeGHQcjNx1pO94rSD+8X8jYvC03yYNAkU=
-github.com/aws/smithy-go v0.5.1-0.20210104190327-c7045c94c1ec/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw=
+github.com/aws/smithy-go v0.5.1-0.20210106170010-b13567a94b97/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw=
+github.com/aws/smithy-go v0.5.1-0.20210107224202-ae5323020d60 h1:ixWi1+ccMWnD0kGI/V4rsIG5nhRKhq1IEXLxBM3P75s=
+github.com/aws/smithy-go v0.5.1-0.20210107224202-ae5323020d60/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0=

diff --git a/feature/dynamodb/expression/go.mod b/feature/dynamodb/expression/go.mod
@@ -3,7 +3,7 @@ module github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression
 go 1.15
 
 require (
-	github.com/aws/aws-sdk-go-v2 v0.31.1-0.20210105194811-58b543144e2a
+	github.com/aws/aws-sdk-go-v2 v0.31.1-0.20210108183639-b6b5057e2ab1
 	github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v0.1.0
 	github.com/aws/aws-sdk-go-v2/service/dynamodb v0.31.0
 )

diff --git a/feature/dynamodb/expression/go.sum b/feature/dynamodb/expression/go.sum
@@ -1,7 +1,8 @@
 github.com/aws/smithy-go v0.5.0 h1:ArsdWUrb1n6/V/REXhuwq2TZv+kuqOBpMlGBd2EkDYM=
 github.com/aws/smithy-go v0.5.0/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw=
-github.com/aws/smithy-go v0.5.1-0.20210104190327-c7045c94c1ec h1:M0qCoLoaSmEeGHQcjNx1pO94rSD+8X8jYvC03yYNAkU=
-github.com/aws/smithy-go v0.5.1-0.20210104190327-c7045c94c1ec/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw=
+github.com/aws/smithy-go v0.5.1-0.20210106170010-b13567a94b97/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw=
+github.com/aws/smithy-go v0.5.1-0.20210107224202-ae5323020d60 h1:ixWi1+ccMWnD0kGI/V4rsIG5nhRKhq1IEXLxBM3P75s=
+github.com/aws/smithy-go v0.5.1-0.20210107224202-ae5323020d60/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=