From af06e72e8e7c3cf8547bd622d91f8245513e7d05 Mon Sep 17 00:00:00 2001 From: Sean McGrail Date: Tue, 8 Dec 2020 15:34:22 -0800 Subject: [PATCH 1/4] Refactor SigV4 signer and middleware constructors --- aws/signer/v4/functional_test.go | 2 +- aws/signer/v4/middleware.go | 20 ++++++-- aws/signer/v4/middleware_test.go | 8 +-- aws/signer/v4/presign_middleware.go | 32 ++++++++---- aws/signer/v4/presign_middleware_test.go | 9 ++-- aws/signer/v4/v4.go | 63 ++++++++++++++---------- 6 files changed, 88 insertions(+), 46 deletions(-) diff --git a/aws/signer/v4/functional_test.go b/aws/signer/v4/functional_test.go index 13386be40ff..fe00d901d51 100644 --- a/aws/signer/v4/functional_test.go +++ b/aws/signer/v4/functional_test.go @@ -35,7 +35,7 @@ func TestStandaloneSign_CustomURIEscape(t *testing.T) { if err != nil { t.Fatalf("expect no error, got %v", err) } - signer := v4.NewSigner(func(signer *v4.Signer) { + signer := v4.NewSigner(func(signer *v4.SignerOptions) { signer.DisableURIPathEscaping = true }) diff --git a/aws/signer/v4/middleware.go b/aws/signer/v4/middleware.go index 272baf37e6d..a9b9f1eebfc 100644 --- a/aws/signer/v4/middleware.go +++ b/aws/signer/v4/middleware.go @@ -195,15 +195,27 @@ func (m *contentSHA256Header) HandleBuild( return next.HandleBuild(ctx, in) } +// SignHTTPRequestMiddlewareOptions is the configuration options for the SignHTTPRequest middleware. +type SignHTTPRequestMiddlewareOptions struct { + CredentialsProvider aws.CredentialsProvider + Signer HTTPSigner + LogSigning bool +} + // SignHTTPRequest is a `FinalizeMiddleware` implementation for SigV4 HTTP Signing type SignHTTPRequest struct { credentialsProvider aws.CredentialsProvider signer HTTPSigner + logSigning bool } // NewSignHTTPRequestMiddleware constructs a SignHTTPRequest using the given Signer for signing requests -func NewSignHTTPRequestMiddleware(credentialsProvider aws.CredentialsProvider, signer HTTPSigner) *SignHTTPRequest { - return &SignHTTPRequest{credentialsProvider: credentialsProvider, signer: signer} +func NewSignHTTPRequestMiddleware(options SignHTTPRequestMiddlewareOptions) *SignHTTPRequest { + return &SignHTTPRequest{ + credentialsProvider: options.CredentialsProvider, + signer: options.Signer, + logSigning: options.LogSigning, + } } // ID is the SignHTTPRequest identifier @@ -235,7 +247,9 @@ func (s *SignHTTPRequest) HandleFinalize(ctx context.Context, in middleware.Fina return out, metadata, &SigningError{Err: fmt.Errorf("failed to retrieve credentials: %w", err)} } - err = s.signer.SignHTTP(ctx, credentials, req.Request, payloadHash, signingName, signingRegion, sdk.NowTime()) + err = s.signer.SignHTTP(ctx, credentials, req.Request, payloadHash, signingName, signingRegion, sdk.NowTime(), func(options *SignerOptions) { + options.LogSigning = s.logSigning + }) if err != nil { return out, metadata, &SigningError{Err: fmt.Errorf("failed to sign http request, %w", err)} } diff --git a/aws/signer/v4/middleware_test.go b/aws/signer/v4/middleware_test.go index 7128ac3adba..9604adcb198 100644 --- a/aws/signer/v4/middleware_test.go +++ b/aws/signer/v4/middleware_test.go @@ -81,10 +81,10 @@ func TestComputePayloadHashMiddleware(t *testing.T) { } } -type httpSignerFunc func(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error +type httpSignerFunc func(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*SignerOptions)) error -func (f httpSignerFunc) SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error { - return f(ctx, credentials, r, payloadHash, service, region, signingTime) +func (f httpSignerFunc) SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*SignerOptions)) error { + return f(ctx, credentials, r, payloadHash, service, region, signingTime, optFns...) } func TestSignHTTPRequestMiddleware(t *testing.T) { @@ -122,7 +122,7 @@ func TestSignHTTPRequestMiddleware(t *testing.T) { signer: httpSignerFunc( func(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, - service string, region string, signingTime time.Time, + service string, region string, signingTime time.Time, _ ...func(*SignerOptions), ) error { expectCreds, _ := unit.StubCredentialsProvider{}.Retrieve(context.Background()) if e, a := expectCreds, credentials; e != a { diff --git a/aws/signer/v4/presign_middleware.go b/aws/signer/v4/presign_middleware.go index 1f87e511a4e..2545957a180 100644 --- a/aws/signer/v4/presign_middleware.go +++ b/aws/signer/v4/presign_middleware.go @@ -19,6 +19,7 @@ type HTTPPresigner interface { PresignHTTP( ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, + optFns ...func(*SignerOptions), ) (url string, signedHeader http.Header, err error) } @@ -30,33 +31,42 @@ type PresignedHTTPRequest struct { SignedHeader http.Header } -// PresignHTTPRequestMiddleware provides the Finalize middleware for creating a +// PresignHTTPRequestMiddlewareOptions is the options for the PresignHTTPRequest middleware. +type PresignHTTPRequestMiddlewareOptions struct { + CredentialsProvider aws.CredentialsProvider + Presigner HTTPPresigner + LogSigning bool +} + +// PresignHTTPRequest provides the Finalize middleware for creating a // presigned URL for an HTTP request. // // Will short circuit the middleware stack and not forward onto the next // Finalize handler. -type PresignHTTPRequestMiddleware struct { +type PresignHTTPRequest struct { credentialsProvider aws.CredentialsProvider presigner HTTPPresigner + logSigning bool } -// NewPresignHTTPRequestMiddleware returns a new PresignHTTPRequestMiddleware +// NewPresignHTTPRequestMiddleware returns a new PresignHTTPRequest // initialized with the presigner. -func NewPresignHTTPRequestMiddleware(provider aws.CredentialsProvider, presigner HTTPPresigner) *PresignHTTPRequestMiddleware { - return &PresignHTTPRequestMiddleware{ - credentialsProvider: provider, - presigner: presigner, +func NewPresignHTTPRequestMiddleware(options PresignHTTPRequestMiddlewareOptions) *PresignHTTPRequest { + return &PresignHTTPRequest{ + credentialsProvider: options.CredentialsProvider, + presigner: options.Presigner, + logSigning: options.LogSigning, } } // ID provides the middleware ID. -func (*PresignHTTPRequestMiddleware) ID() string { return "PresignHTTPRequestMiddleware" } +func (*PresignHTTPRequest) ID() string { return "PresignHTTPRequest" } // HandleFinalize will take the provided input and create a presigned url for // the http request using the SigV4 presign authentication scheme. // // Since the signed request is not a valid HTTP request -func (s *PresignHTTPRequestMiddleware) HandleFinalize( +func (s *PresignHTTPRequest) HandleFinalize( ctx context.Context, in middleware.FinalizeInput, next middleware.FinalizeHandler, ) ( out middleware.FinalizeOutput, metadata middleware.Metadata, err error, @@ -96,7 +106,9 @@ func (s *PresignHTTPRequestMiddleware) HandleFinalize( } u, h, err := s.presigner.PresignHTTP(ctx, credentials, - httpReq, payloadHash, signingName, signingRegion, sdk.NowTime()) + httpReq, payloadHash, signingName, signingRegion, sdk.NowTime(), func(options *SignerOptions) { + options.LogSigning = s.logSigning + }) if err != nil { return out, metadata, &SigningError{ Err: fmt.Errorf("failed to sign http request, %w", err), diff --git a/aws/signer/v4/presign_middleware_test.go b/aws/signer/v4/presign_middleware_test.go index c6e9625a17b..98747465ef0 100644 --- a/aws/signer/v4/presign_middleware_test.go +++ b/aws/signer/v4/presign_middleware_test.go @@ -19,15 +19,17 @@ import ( type httpPresignerFunc func( ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, + optFns ...func(*SignerOptions), ) (url string, signedHeader http.Header, err error) func (f httpPresignerFunc) PresignHTTP( ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, + optFns ...func(*SignerOptions), ) ( url string, signedHeader http.Header, err error, ) { - return f(ctx, credentials, r, payloadHash, service, region, signingTime) + return f(ctx, credentials, r, payloadHash, service, region, signingTime, optFns...) } func TestPresignHTTPRequestMiddleware(t *testing.T) { @@ -103,12 +105,13 @@ func TestPresignHTTPRequestMiddleware(t *testing.T) { for name, c := range cases { t.Run(name, func(t *testing.T) { - m := &PresignHTTPRequestMiddleware{ + m := &PresignHTTPRequest{ credentialsProvider: c.Creds, presigner: httpPresignerFunc(func( ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, + _ ...func(*SignerOptions), ) (url string, signedHeader http.Header, err error) { if !haveCredentialProvider(c.Creds) { @@ -175,5 +178,5 @@ func TestPresignHTTPRequestMiddleware(t *testing.T) { } var ( - _ middleware.FinalizeMiddleware = &PresignHTTPRequestMiddleware{} + _ middleware.FinalizeMiddleware = &PresignHTTPRequest{} ) diff --git a/aws/signer/v4/v4.go b/aws/signer/v4/v4.go index 079c627dc4f..a1e31497a8b 100644 --- a/aws/signer/v4/v4.go +++ b/aws/signer/v4/v4.go @@ -69,16 +69,15 @@ const ( // HTTPSigner is an interface to a SigV4 signer that can sign HTTP requests type HTTPSigner interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*SignerOptions)) error } type keyDerivator interface { DeriveKey(credential aws.Credentials, service, region string, signingTime v4Internal.SigningTime) []byte } -// Signer applies AWS v4 signing to given request. Use this to sign requests -// that need to be signed with AWS V4 Signatures. -type Signer struct { +// SignerOptions is the SigV4 Signer options. +type SignerOptions struct { // Disables the Signer's moving HTTP header key/value pairs from the HTTP // request header to the request's query string. This is most commonly used // with pre-signed requests preventing headers from being added to the @@ -101,19 +100,24 @@ type Signer struct { // This will enable logging of the canonical request, the string to sign, and for presigning the subsequent // presigned URL. LogSigning bool +} +// Signer applies AWS v4 signing to given request. Use this to sign requests +// that need to be signed with AWS V4 Signatures. +type Signer struct { + options SignerOptions keyDerivator keyDerivator } // NewSigner returns a new SigV4 Signer -func NewSigner(optFns ...func(signer *Signer)) *Signer { - s := &Signer{keyDerivator: v4Internal.NewSigningKeyDeriver()} +func NewSigner(optFns ...func(signer *SignerOptions)) *Signer { + options := SignerOptions{} for _, fn := range optFns { - fn(s) + fn(&options) } - return s + return &Signer{options: options, keyDerivator: v4Internal.NewSigningKeyDeriver()} } type httpSigner struct { @@ -240,10 +244,6 @@ func buildAuthorizationHeader(credentialStr, signedHeadersStr, signingSignature return parts.String() } -func (v4 Signer) getLogger(ctx context.Context) logging.Logger { - return logging.WithContext(ctx, v4.Logger) -} - // SignHTTP signs AWS v4 requests with the provided payload hash, service name, region the // request is made to, and time the request is signed at. The signTime allows // you to specify that a request is signed for the future, and cannot be @@ -255,7 +255,13 @@ func (v4 Signer) getLogger(ctx context.Context) logging.Logger { // will not be lost. // // The passed in request will be modified in place. -func (v4 Signer) SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error { +func (s Signer) SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(options *SignerOptions)) error { + options := s.options + + for _, fn := range optFns { + fn(&options) + } + signer := &httpSigner{ Request: r, PayloadHash: payloadHash, @@ -263,9 +269,9 @@ func (v4 Signer) SignHTTP(ctx context.Context, credentials aws.Credentials, r *h Region: region, Credentials: credentials, Time: v4Internal.NewSigningTime(signingTime.UTC()), - DisableHeaderHoisting: v4.DisableHeaderHoisting, - DisableURIPathEscaping: v4.DisableURIPathEscaping, - KeyDerivator: v4.keyDerivator, + DisableHeaderHoisting: options.DisableHeaderHoisting, + DisableURIPathEscaping: options.DisableURIPathEscaping, + KeyDerivator: s.keyDerivator, } signedRequest, err := signer.Build() @@ -273,7 +279,7 @@ func (v4 Signer) SignHTTP(ctx context.Context, credentials aws.Credentials, r *h return err } - v4.logSigningInfo(ctx, &signedRequest, false) + logSigningInfo(ctx, options, &signedRequest, false) return nil } @@ -307,10 +313,17 @@ func (v4 Signer) SignHTTP(ctx context.Context, credentials aws.Credentials, r *h // req.URL.RawQuery = query.Encode() // // This method does not modify the provided request. -func (v4 *Signer) PresignHTTP( +func (s *Signer) PresignHTTP( ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, + optFns ...func(*SignerOptions), ) (signedURI string, signedHeaders http.Header, err error) { + options := s.options + + for _, fn := range optFns { + fn(&options) + } + signer := &httpSigner{ Request: r.Clone(r.Context()), PayloadHash: payloadHash, @@ -319,9 +332,9 @@ func (v4 *Signer) PresignHTTP( Credentials: credentials, Time: v4Internal.NewSigningTime(signingTime.UTC()), IsPreSign: true, - DisableHeaderHoisting: v4.DisableHeaderHoisting, - DisableURIPathEscaping: v4.DisableURIPathEscaping, - KeyDerivator: v4.keyDerivator, + DisableHeaderHoisting: options.DisableHeaderHoisting, + DisableURIPathEscaping: options.DisableURIPathEscaping, + KeyDerivator: s.keyDerivator, } signedRequest, err := signer.Build() @@ -329,7 +342,7 @@ func (v4 *Signer) PresignHTTP( return "", nil, err } - v4.logSigningInfo(ctx, &signedRequest, true) + logSigningInfo(ctx, options, &signedRequest, true) return signedRequest.Request.URL.String(), signedRequest.SignedHeaders, nil } @@ -461,15 +474,15 @@ func (s *httpSigner) setRequiredSigningFields(headers http.Header, query url.Val } } -func (v4 Signer) logSigningInfo(ctx context.Context, request *signedRequest, isPresign bool) { - if !v4.LogSigning { +func logSigningInfo(ctx context.Context, options SignerOptions, request *signedRequest, isPresign bool) { + if !options.LogSigning { return } signedURLMsg := "" if isPresign { signedURLMsg = fmt.Sprintf(logSignedURLMsg, request.Request.URL.String()) } - logger := v4.getLogger(ctx) + logger := logging.WithContext(ctx, options.Logger) logger.Logf(logging.Debug, logSignInfoMsg, request.CanonicalString, request.StringToSign, signedURLMsg) } From 833d289559c57f04eb1587e4f6edbc19239bcea1 Mon Sep 17 00:00:00 2001 From: Sean McGrail Date: Tue, 8 Dec 2020 17:21:41 -0800 Subject: [PATCH 2/4] Codegen Changes --- .../AwsHttpPresignURLClientGenerator.java | 18 ++++++++--- .../aws/go/codegen/AwsSignatureVersion4.java | 30 ++++++++++++------- 2 files changed, 33 insertions(+), 15 deletions(-) diff --git a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsHttpPresignURLClientGenerator.java b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsHttpPresignURLClientGenerator.java index eb0981038a7..021468475ff 100644 --- a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsHttpPresignURLClientGenerator.java +++ b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsHttpPresignURLClientGenerator.java @@ -352,8 +352,14 @@ private void writeConvertToPresignMiddleware( writer.write("stack.Deserialize.Clear()"); writer.write("stack.Build.Remove(($P)(nil).ID())", requestInvocationID); - writer.write("err = stack.Finalize.Add($T(options.Credentials, c.presigner), $T)", - presignMiddleware, smithyAfter); + Symbol middlewareOptionsSymbol = SymbolUtils.createValueSymbolBuilder( + "PresignHTTPRequestMiddlewareOptions", AwsGoDependency.AWS_SIGNER_V4).build(); + writer.openBlock("pmw := $T($T{", "})", presignMiddleware, middlewareOptionsSymbol, () -> { + writer.write("CredentialsProvider: options.$L,", AddAwsConfigFields.CREDENTIALS_CONFIG_NAME); + writer.write("Presigner: c.presigner,"); + writer.write("LogSigning: options.$L.IsSigning(),", AddAwsConfigFields.LOG_MODE_CONFIG_NAME); + }); + writer.write("err = stack.Finalize.Add(pmw, $T)", smithyAfter); writer.write("if err != nil { return err }"); // if protocol used is ec2query or query @@ -466,14 +472,18 @@ public void writePresignInterface( SymbolProvider symbolProvider, ServiceShape serviceShape ) { + Symbol signerOptionsSymbol = SymbolUtils.createPointableSymbolBuilder("SignerOptions", + AwsGoDependency.AWS_SIGNER_V4).build(); + writer.writeDocs( String.format("%s represents presigner interface used by presign url client", presignerInterfaceSymbol.getName()) ); writer.openBlock("type $T interface {", "}", presignerInterfaceSymbol, () -> { writer.write("PresignHTTP("); - writer.write("ctx context.Context, credentials aws.Credentials, r *http.Request, "); - writer.write("payloadHash string, service string, region string, signingTime time.Time, "); + writer.write("ctx context.Context, credentials aws.Credentials, r *http.Request,"); + writer.write("payloadHash string, service string, region string, signingTime time.Time,"); + writer.write("optFns ...func($P),", signerOptionsSymbol); writer.write(") (url string, signedHeader http.Header, err error)"); }); diff --git a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsSignatureVersion4.java b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsSignatureVersion4.java index b52b67a1fc5..a425a915b1f 100644 --- a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsSignatureVersion4.java +++ b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsSignatureVersion4.java @@ -46,7 +46,6 @@ public final class AwsSignatureVersion4 implements GoIntegration { public static final String SIGNER_CONFIG_FIELD_NAME = SIGNER_INTERFACE_NAME; public static final String SIGNER_RESOLVER = "resolve" + SIGNER_CONFIG_FIELD_NAME; - private static final String CONFIGURE_SIGNER_FUNCTION = "configureSignerV4"; private static final List DISABLE_URI_PATH_ESCAPE = ListUtils.of("com.amazonaws.s3#AmazonS3"); @Override @@ -75,27 +74,29 @@ private void writerSignerInterface(GoWriter writer) { writer.openBlock("type $L interface {", "}", SIGNER_INTERFACE_NAME, () -> { writer.addUseImports(SmithyGoDependency.CONTEXT); writer.addUseImports(AwsGoDependency.AWS_CORE); + writer.addUseImports(AwsGoDependency.AWS_SIGNER_V4); writer.addUseImports(SmithyGoDependency.NET_HTTP); writer.addUseImports(SmithyGoDependency.TIME); writer.write("SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, " - + "payloadHash string, service string, region string, signingTime time.Time) error"); + + "payloadHash string, service string, region string, signingTime time.Time, " + + "optFns ...func(*v4.SignerOptions)) error"); }); } private void writerConfigFieldResolver(GoWriter writer, ServiceShape serviceShape) { Symbol newSignerSymbol = SymbolUtils.createValueSymbolBuilder("NewSigner", AwsGoDependency.AWS_SIGNER_V4).build(); - Symbol signerSymbol = SymbolUtils.createPointableSymbolBuilder("Signer", + Symbol signerOptionsSymbol = SymbolUtils.createPointableSymbolBuilder("SignerOptions", AwsGoDependency.AWS_SIGNER_V4).build(); writer.openBlock("func $L(o *Options) {", "}", SIGNER_RESOLVER, () -> { writer.openBlock("if o.$L != nil {", "}", SIGNER_CONFIG_FIELD_NAME, () -> writer.write("return")); writer.openBlock("o.$L = $T(", ")", SIGNER_CONFIG_FIELD_NAME, newSignerSymbol, () -> { - writer.openBlock("func (s $P) {", "},", signerSymbol, () -> { - writer.write("s.Logger = o.$L", AddAwsConfigFields.LOGGER_CONFIG_NAME); - writer.write("s.LogSigning = o.$L.IsSigning()", AddAwsConfigFields.LOG_MODE_CONFIG_NAME); + writer.openBlock("func (so $P) {", "},", signerOptionsSymbol, () -> { + writer.write("so.Logger = o.$L", AddAwsConfigFields.LOGGER_CONFIG_NAME); + writer.write("so.LogSigning = o.$L.IsSigning()", AddAwsConfigFields.LOG_MODE_CONFIG_NAME); if (DISABLE_URI_PATH_ESCAPE.contains(serviceShape.getId().toString())) { - writer.write("s.DisableURIPathEscaping = true"); + writer.write("so.DisableURIPathEscaping = true"); } }); }); @@ -120,10 +121,17 @@ private void writeMiddlewareRegister(Model model, GoWriter writer, ServiceShape writer.addUseImports(SmithyGoDependency.SMITHY_MIDDLEWARE); writer.openBlock("func $L(stack $P, o Options) error {", "}", REGISTER_MIDDLEWARE_FUNCTION, SymbolUtils.createPointableSymbolBuilder("Stack", SmithyGoDependency.SMITHY_MIDDLEWARE).build(), () -> { - writer.write("return stack.Finalize.Add($T(o.$L, o.$L), middleware.After)", - SymbolUtils.createValueSymbolBuilder("NewSignHTTPRequestMiddleware", - AwsGoDependency.AWS_SIGNER_V4).build(), - AddAwsConfigFields.CREDENTIALS_CONFIG_NAME, SIGNER_CONFIG_FIELD_NAME); + Symbol newMiddlewareSymbol = SymbolUtils.createValueSymbolBuilder( + "NewSignHTTPRequestMiddleware", AwsGoDependency.AWS_SIGNER_V4).build(); + Symbol middlewareOptionsSymbol = SymbolUtils.createValueSymbolBuilder( + "SignHTTPRequestMiddlewareOptions", AwsGoDependency.AWS_SIGNER_V4).build(); + + writer.openBlock("mw := $T($T{", "})", newMiddlewareSymbol, middlewareOptionsSymbol, () -> { + writer.write("CredentialsProvider: o.$L,", AddAwsConfigFields.CREDENTIALS_CONFIG_NAME); + writer.write("Signer: o.$L,", SIGNER_CONFIG_FIELD_NAME); + writer.write("LogSigning: o.$L.IsSigning(),", AddAwsConfigFields.LOG_MODE_CONFIG_NAME); + }); + writer.write("return stack.Finalize.Add(mw, middleware.After)"); }); writer.write(""); } From c25c16bd1c8c897992eb8aa42fe14e00097f5c57 Mon Sep 17 00:00:00 2001 From: Sean McGrail Date: Tue, 8 Dec 2020 17:21:55 -0800 Subject: [PATCH 3/4] Regenerated Clients --- aws/credential_cache.go | 2 +- aws/credential_cache_test.go | 4 +-- config/resolve_credentials.go | 2 +- example/service/s3/listObjects/go.mod | 7 ------ feature/s3/manager/go.mod | 6 ----- internal/protocoltest/jsonrpc/api_client.go | 15 +++++++---- internal/repotools/changes/go.mod | 2 ++ internal/repotools/changes/go.sum | 2 -- service/accessanalyzer/api_client.go | 15 +++++++---- service/acm/api_client.go | 15 +++++++---- service/acmpca/api_client.go | 15 +++++++---- service/alexaforbusiness/api_client.go | 15 +++++++---- service/amplify/api_client.go | 15 +++++++---- service/apigateway/api_client.go | 15 +++++++---- service/apigatewaymanagementapi/api_client.go | 15 +++++++---- service/apigatewayv2/api_client.go | 15 +++++++---- service/appconfig/api_client.go | 15 +++++++---- service/appflow/api_client.go | 15 +++++++---- service/applicationautoscaling/api_client.go | 15 +++++++---- .../applicationdiscoveryservice/api_client.go | 15 +++++++---- service/applicationinsights/api_client.go | 15 +++++++---- service/appmesh/api_client.go | 15 +++++++---- service/appstream/api_client.go | 15 +++++++---- service/appsync/api_client.go | 15 +++++++---- service/athena/api_client.go | 15 +++++++---- service/autoscaling/api_client.go | 15 +++++++---- service/autoscalingplans/api_client.go | 15 +++++++---- service/backup/api_client.go | 15 +++++++---- service/batch/api_client.go | 15 +++++++---- service/braket/api_client.go | 15 +++++++---- service/budgets/api_client.go | 15 +++++++---- service/chime/api_client.go | 15 +++++++---- service/cloud9/api_client.go | 15 +++++++---- service/clouddirectory/api_client.go | 15 +++++++---- service/cloudformation/api_client.go | 15 +++++++---- service/cloudfront/api_client.go | 15 +++++++---- service/cloudhsm/api_client.go | 15 +++++++---- service/cloudhsmv2/api_client.go | 15 +++++++---- service/cloudsearch/api_client.go | 15 +++++++---- service/cloudsearchdomain/api_client.go | 15 +++++++---- service/cloudtrail/api_client.go | 15 +++++++---- service/cloudwatch/api_client.go | 15 +++++++---- service/cloudwatchevents/api_client.go | 15 +++++++---- service/cloudwatchlogs/api_client.go | 15 +++++++---- service/codeartifact/api_client.go | 15 +++++++---- service/codebuild/api_client.go | 15 +++++++---- service/codecommit/api_client.go | 15 +++++++---- service/codedeploy/api_client.go | 15 +++++++---- service/codeguruprofiler/api_client.go | 15 +++++++---- service/codegurureviewer/api_client.go | 15 +++++++---- service/codepipeline/api_client.go | 15 +++++++---- service/codestar/api_client.go | 15 +++++++---- service/codestarconnections/api_client.go | 15 +++++++---- service/codestarnotifications/api_client.go | 15 +++++++---- service/cognitoidentity/api_client.go | 15 +++++++---- service/cognitoidentityprovider/api_client.go | 15 +++++++---- service/cognitosync/api_client.go | 15 +++++++---- service/comprehend/api_client.go | 15 +++++++---- service/comprehendmedical/api_client.go | 15 +++++++---- service/computeoptimizer/api_client.go | 15 +++++++---- service/configservice/api_client.go | 15 +++++++---- service/connect/api_client.go | 15 +++++++---- service/connectparticipant/api_client.go | 15 +++++++---- .../costandusagereportservice/api_client.go | 15 +++++++---- service/costexplorer/api_client.go | 15 +++++++---- .../databasemigrationservice/api_client.go | 15 +++++++---- service/databrew/api_client.go | 15 +++++++---- service/dataexchange/api_client.go | 15 +++++++---- service/datapipeline/api_client.go | 15 +++++++---- service/datasync/api_client.go | 15 +++++++---- service/dax/api_client.go | 15 +++++++---- service/detective/api_client.go | 15 +++++++---- service/devicefarm/api_client.go | 15 +++++++---- service/directconnect/api_client.go | 15 +++++++---- service/directoryservice/api_client.go | 15 +++++++---- service/dlm/api_client.go | 15 +++++++---- service/docdb/api_client.go | 15 +++++++---- service/dynamodb/api_client.go | 15 +++++++---- service/dynamodbstreams/api_client.go | 15 +++++++---- service/ebs/api_client.go | 15 +++++++---- service/ec2/api_client.go | 23 ++++++++++++----- service/ec2instanceconnect/api_client.go | 15 +++++++---- service/ecr/api_client.go | 15 +++++++---- service/ecs/api_client.go | 15 +++++++---- service/efs/api_client.go | 15 +++++++---- service/eks/api_client.go | 15 +++++++---- service/elasticache/api_client.go | 15 +++++++---- service/elasticbeanstalk/api_client.go | 15 +++++++---- service/elasticinference/api_client.go | 15 +++++++---- service/elasticloadbalancing/api_client.go | 15 +++++++---- service/elasticloadbalancingv2/api_client.go | 15 +++++++---- service/elasticsearchservice/api_client.go | 15 +++++++---- service/elastictranscoder/api_client.go | 15 +++++++---- service/emr/api_client.go | 15 +++++++---- service/eventbridge/api_client.go | 15 +++++++---- service/firehose/api_client.go | 15 +++++++---- service/fms/api_client.go | 15 +++++++---- service/forecast/api_client.go | 15 +++++++---- service/forecastquery/api_client.go | 15 +++++++---- service/frauddetector/api_client.go | 15 +++++++---- service/fsx/api_client.go | 15 +++++++---- service/gamelift/api_client.go | 15 +++++++---- service/glacier/api_client.go | 15 +++++++---- service/globalaccelerator/api_client.go | 15 +++++++---- service/glue/api_client.go | 15 +++++++---- service/greengrass/api_client.go | 15 +++++++---- service/groundstation/api_client.go | 15 +++++++---- service/guardduty/api_client.go | 15 +++++++---- service/health/api_client.go | 15 +++++++---- service/honeycode/api_client.go | 15 +++++++---- service/iam/api_client.go | 15 +++++++---- service/identitystore/api_client.go | 15 +++++++---- service/imagebuilder/api_client.go | 15 +++++++---- service/inspector/api_client.go | 15 +++++++---- service/internal/benchmark/go.mod | 1 - service/internal/integrationtest/go.mod | 5 ---- service/iot/api_client.go | 15 +++++++---- service/iot1clickdevicesservice/api_client.go | 15 +++++++---- service/iot1clickprojects/api_client.go | 15 +++++++---- service/iotanalytics/api_client.go | 15 +++++++---- service/iotdataplane/api_client.go | 15 +++++++---- service/iotevents/api_client.go | 15 +++++++---- service/ioteventsdata/api_client.go | 15 +++++++---- service/iotjobsdataplane/api_client.go | 15 +++++++---- service/iotsecuretunneling/api_client.go | 15 +++++++---- service/iotsitewise/api_client.go | 15 +++++++---- service/iotthingsgraph/api_client.go | 15 +++++++---- service/ivs/api_client.go | 15 +++++++---- service/kafka/api_client.go | 15 +++++++---- service/kendra/api_client.go | 15 +++++++---- service/kinesis/api_client.go | 15 +++++++---- service/kinesisanalytics/api_client.go | 15 +++++++---- service/kinesisanalyticsv2/api_client.go | 15 +++++++---- service/kinesisvideo/api_client.go | 15 +++++++---- .../kinesisvideoarchivedmedia/api_client.go | 15 +++++++---- service/kinesisvideomedia/api_client.go | 15 +++++++---- service/kinesisvideosignaling/api_client.go | 15 +++++++---- service/kms/api_client.go | 15 +++++++---- service/lakeformation/api_client.go | 15 +++++++---- service/lambda/api_client.go | 15 +++++++---- service/lexmodelbuildingservice/api_client.go | 15 +++++++---- service/lexruntimeservice/api_client.go | 15 +++++++---- service/licensemanager/api_client.go | 15 +++++++---- service/lightsail/api_client.go | 15 +++++++---- service/machinelearning/api_client.go | 15 +++++++---- service/macie/api_client.go | 15 +++++++---- service/macie2/api_client.go | 15 +++++++---- service/managedblockchain/api_client.go | 15 +++++++---- service/marketplacecatalog/api_client.go | 15 +++++++---- .../api_client.go | 15 +++++++---- .../api_client.go | 15 +++++++---- service/marketplacemetering/api_client.go | 15 +++++++---- service/mediaconnect/api_client.go | 15 +++++++---- service/mediaconvert/api_client.go | 15 +++++++---- service/medialive/api_client.go | 15 +++++++---- service/mediapackage/api_client.go | 15 +++++++---- service/mediapackagevod/api_client.go | 15 +++++++---- service/mediastore/api_client.go | 15 +++++++---- service/mediastoredata/api_client.go | 15 +++++++---- service/mediatailor/api_client.go | 15 +++++++---- service/migrationhub/api_client.go | 15 +++++++---- service/migrationhubconfig/api_client.go | 15 +++++++---- service/mobile/api_client.go | 15 +++++++---- service/mq/api_client.go | 15 +++++++---- service/mturk/api_client.go | 15 +++++++---- service/neptune/api_client.go | 15 +++++++---- service/networkfirewall/api_client.go | 15 +++++++---- service/networkmanager/api_client.go | 15 +++++++---- service/opsworks/api_client.go | 15 +++++++---- service/opsworkscm/api_client.go | 15 +++++++---- service/organizations/api_client.go | 15 +++++++---- service/outposts/api_client.go | 15 +++++++---- service/personalize/api_client.go | 15 +++++++---- service/personalizeevents/api_client.go | 15 +++++++---- service/personalizeruntime/api_client.go | 15 +++++++---- service/pi/api_client.go | 15 +++++++---- service/pinpoint/api_client.go | 15 +++++++---- service/pinpointemail/api_client.go | 15 +++++++---- service/pinpointsmsvoice/api_client.go | 15 +++++++---- service/polly/api_client.go | 15 +++++++---- service/pricing/api_client.go | 15 +++++++---- service/qldb/api_client.go | 15 +++++++---- service/qldbsession/api_client.go | 15 +++++++---- service/quicksight/api_client.go | 15 +++++++---- service/ram/api_client.go | 15 +++++++---- service/rds/api_client.go | 23 ++++++++++++----- service/rdsdata/api_client.go | 15 +++++++---- service/redshift/api_client.go | 15 +++++++---- service/redshiftdata/api_client.go | 15 +++++++---- service/rekognition/api_client.go | 15 +++++++---- service/resourcegroups/api_client.go | 15 +++++++---- .../resourcegroupstaggingapi/api_client.go | 15 +++++++---- service/robomaker/api_client.go | 15 +++++++---- service/route53/api_client.go | 15 +++++++---- service/route53domains/api_client.go | 15 +++++++---- service/route53resolver/api_client.go | 15 +++++++---- service/s3/api_client.go | 25 +++++++++++++------ service/s3/internal/configtesting/go.mod | 7 ------ service/s3control/api_client.go | 15 +++++++---- service/s3outposts/api_client.go | 15 +++++++---- service/sagemaker/api_client.go | 15 +++++++---- service/sagemakera2iruntime/api_client.go | 15 +++++++---- service/sagemakerruntime/api_client.go | 15 +++++++---- service/savingsplans/api_client.go | 15 +++++++---- service/schemas/api_client.go | 15 +++++++---- service/secretsmanager/api_client.go | 15 +++++++---- service/securityhub/api_client.go | 15 +++++++---- .../api_client.go | 15 +++++++---- service/servicecatalog/api_client.go | 15 +++++++---- .../servicecatalogappregistry/api_client.go | 15 +++++++---- service/servicediscovery/api_client.go | 15 +++++++---- service/servicequotas/api_client.go | 15 +++++++---- service/ses/api_client.go | 15 +++++++---- service/sesv2/api_client.go | 15 +++++++---- service/sfn/api_client.go | 15 +++++++---- service/shield/api_client.go | 15 +++++++---- service/signer/api_client.go | 15 +++++++---- service/sms/api_client.go | 15 +++++++---- service/snowball/api_client.go | 15 +++++++---- service/sns/api_client.go | 15 +++++++---- service/sqs/api_client.go | 15 +++++++---- service/ssm/api_client.go | 15 +++++++---- service/sso/api_client.go | 15 +++++++---- service/ssoadmin/api_client.go | 15 +++++++---- service/ssooidc/api_client.go | 15 +++++++---- service/storagegateway/api_client.go | 15 +++++++---- service/sts/api_client.go | 15 +++++++---- service/support/api_client.go | 15 +++++++---- service/swf/api_client.go | 15 +++++++---- service/synthetics/api_client.go | 15 +++++++---- service/textract/api_client.go | 15 +++++++---- service/timestreamquery/api_client.go | 15 +++++++---- service/timestreamwrite/api_client.go | 15 +++++++---- service/transcribe/api_client.go | 15 +++++++---- service/transfer/api_client.go | 15 +++++++---- service/translate/api_client.go | 15 +++++++---- service/waf/api_client.go | 15 +++++++---- service/wafregional/api_client.go | 15 +++++++---- service/wafv2/api_client.go | 15 +++++++---- service/workdocs/api_client.go | 15 +++++++---- service/worklink/api_client.go | 15 +++++++---- service/workmail/api_client.go | 15 +++++++---- service/workmailmessageflow/api_client.go | 15 +++++++---- service/workspaces/api_client.go | 15 +++++++---- service/xray/api_client.go | 15 +++++++---- 245 files changed, 2378 insertions(+), 1211 deletions(-) diff --git a/aws/credential_cache.go b/aws/credential_cache.go index 1203281019a..1411a5c32d6 100644 --- a/aws/credential_cache.go +++ b/aws/credential_cache.go @@ -70,7 +70,7 @@ func NewCredentialsCache(provider CredentialsProvider, optFns ...func(options *C return &CredentialsCache{ provider: provider, - options: options, + options: options, } } diff --git a/aws/credential_cache_test.go b/aws/credential_cache_test.go index b9d350c0fc5..314c7c1da81 100644 --- a/aws/credential_cache_test.go +++ b/aws/credential_cache_test.go @@ -174,8 +174,8 @@ func TestCredentialsCache_ExpireTime(t *testing.T) { }, }, "no expire window with jitter": { - ExpireTime: mockTime, - JitterFrac: 0.5, + ExpireTime: mockTime, + JitterFrac: 0.5, Validate: func(t *testing.T, v time.Time) { t.Helper() if e, a := mockTime, v; !e.Equal(a) { diff --git a/config/resolve_credentials.go b/config/resolve_credentials.go index e0ceab59054..c54d112036c 100644 --- a/config/resolve_credentials.go +++ b/config/resolve_credentials.go @@ -267,7 +267,7 @@ func resolveEC2RoleCredentials(cfg *aws.Config, configs configs) error { provider := ec2rolecreds.New(optFns...) cfg.Credentials = wrapWithCredentialsCache(provider, func(options *aws.CredentialsCacheOptions) { - options.ExpiryWindow = 5*time.Minute + options.ExpiryWindow = 5 * time.Minute }) return nil diff --git a/example/service/s3/listObjects/go.mod b/example/service/s3/listObjects/go.mod index 70e3c0e858e..e786e70972e 100644 --- a/example/service/s3/listObjects/go.mod +++ b/example/service/s3/listObjects/go.mod @@ -4,14 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2/config v0.3.0 - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v0.3.2 // indirect github.com/aws/aws-sdk-go-v2/service/s3 v0.30.0 - github.com/aws/aws-sdk-go-v2 v0.30.0 - github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v0.3.1 - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v0.1.2 - github.com/aws/aws-sdk-go-v2/service/sts v0.30.0 - github.com/aws/aws-sdk-go-v2/credentials v0.1.5 - github.com/aws/aws-sdk-go-v2/ec2imds v0.1.5 ) replace github.com/aws/aws-sdk-go-v2/config => ../../../../config/ diff --git a/feature/s3/manager/go.mod b/feature/s3/manager/go.mod index d11b726a377..73c7a3a026f 100644 --- a/feature/s3/manager/go.mod +++ b/feature/s3/manager/go.mod @@ -5,15 +5,9 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v0.30.0 github.com/aws/aws-sdk-go-v2/config v0.3.0 - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v0.3.2 // indirect github.com/aws/aws-sdk-go-v2/service/s3 v0.30.0 github.com/awslabs/smithy-go v0.4.0 github.com/google/go-cmp v0.5.4 - github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v0.3.1 - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v0.1.2 - github.com/aws/aws-sdk-go-v2/service/sts v0.30.0 - github.com/aws/aws-sdk-go-v2/credentials v0.1.5 - github.com/aws/aws-sdk-go-v2/ec2imds v0.1.5 ) replace github.com/aws/aws-sdk-go-v2 => ../../../ diff --git a/internal/protocoltest/jsonrpc/api_client.go b/internal/protocoltest/jsonrpc/api_client.go index 277261f2114..952cc031cda 100644 --- a/internal/protocoltest/jsonrpc/api_client.go +++ b/internal/protocoltest/jsonrpc/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/internal/repotools/changes/go.mod b/internal/repotools/changes/go.mod index 340f0caf5e7..9861f2a497b 100644 --- a/internal/repotools/changes/go.mod +++ b/internal/repotools/changes/go.mod @@ -8,3 +8,5 @@ require ( golang.org/x/mod v0.3.0 gopkg.in/yaml.v2 v2.3.0 ) + +replace github.com/aws/aws-sdk-go-v2 => ../../../ diff --git a/internal/repotools/changes/go.sum b/internal/repotools/changes/go.sum index 5d84a21c973..b4791223a63 100644 --- a/internal/repotools/changes/go.sum +++ b/internal/repotools/changes/go.sum @@ -1,5 +1,3 @@ -github.com/aws/aws-sdk-go-v2 v0.30.0 h1:/CjXUnWXnvdgOqHa65UIs2TODa5D5lm3ty7O0wWuYHY= -github.com/aws/aws-sdk-go-v2 v0.30.0/go.mod h1:vEDjzdktTH+FoEOV6BWgYLEzvPti13Onp5/qQrSiLPg= github.com/awslabs/smithy-go v0.4.0 h1:El0KyKn4zdM3pLuWJlgoeitQuu/mjwUPssr7L3xu3vs= github.com/awslabs/smithy-go v0.4.0/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/service/accessanalyzer/api_client.go b/service/accessanalyzer/api_client.go index 74a67b63701..9ea909f3c5a 100644 --- a/service/accessanalyzer/api_client.go +++ b/service/accessanalyzer/api_client.go @@ -190,11 +190,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -202,9 +207,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/acm/api_client.go b/service/acm/api_client.go index ac939761f74..6306c769df2 100644 --- a/service/acm/api_client.go +++ b/service/acm/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/acmpca/api_client.go b/service/acmpca/api_client.go index e283198df56..c5a785094b3 100644 --- a/service/acmpca/api_client.go +++ b/service/acmpca/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/alexaforbusiness/api_client.go b/service/alexaforbusiness/api_client.go index 064545c0c07..c56b754055d 100644 --- a/service/alexaforbusiness/api_client.go +++ b/service/alexaforbusiness/api_client.go @@ -190,11 +190,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -202,9 +207,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/amplify/api_client.go b/service/amplify/api_client.go index c432174081b..f06260cffc1 100644 --- a/service/amplify/api_client.go +++ b/service/amplify/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/apigateway/api_client.go b/service/apigateway/api_client.go index 0829ef77269..bb0e708a082 100644 --- a/service/apigateway/api_client.go +++ b/service/apigateway/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/apigatewaymanagementapi/api_client.go b/service/apigatewaymanagementapi/api_client.go index 1d79e4fa349..9ba71a6617b 100644 --- a/service/apigatewaymanagementapi/api_client.go +++ b/service/apigatewaymanagementapi/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/apigatewayv2/api_client.go b/service/apigatewayv2/api_client.go index 9efcf44949a..a107459422d 100644 --- a/service/apigatewayv2/api_client.go +++ b/service/apigatewayv2/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/appconfig/api_client.go b/service/appconfig/api_client.go index 5e1015a33a4..916904de2f3 100644 --- a/service/appconfig/api_client.go +++ b/service/appconfig/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/appflow/api_client.go b/service/appflow/api_client.go index 332692cf8a1..a0b694a8948 100644 --- a/service/appflow/api_client.go +++ b/service/appflow/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/applicationautoscaling/api_client.go b/service/applicationautoscaling/api_client.go index ae9641e18da..d2b482694db 100644 --- a/service/applicationautoscaling/api_client.go +++ b/service/applicationautoscaling/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/applicationdiscoveryservice/api_client.go b/service/applicationdiscoveryservice/api_client.go index f39b1bd6676..4b55b0881b3 100644 --- a/service/applicationdiscoveryservice/api_client.go +++ b/service/applicationdiscoveryservice/api_client.go @@ -191,11 +191,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -203,9 +208,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/applicationinsights/api_client.go b/service/applicationinsights/api_client.go index 9c9fb749213..fade2f32ccc 100644 --- a/service/applicationinsights/api_client.go +++ b/service/applicationinsights/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/appmesh/api_client.go b/service/appmesh/api_client.go index 43277ce5fe6..f1db9d5ba4f 100644 --- a/service/appmesh/api_client.go +++ b/service/appmesh/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/appstream/api_client.go b/service/appstream/api_client.go index d0a9a680d50..f9ac50e7a39 100644 --- a/service/appstream/api_client.go +++ b/service/appstream/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/appsync/api_client.go b/service/appsync/api_client.go index 804669e3c05..6d1f3c0251e 100644 --- a/service/appsync/api_client.go +++ b/service/appsync/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/athena/api_client.go b/service/athena/api_client.go index b2ea531b7af..8279a4915e6 100644 --- a/service/athena/api_client.go +++ b/service/athena/api_client.go @@ -190,11 +190,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -202,9 +207,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/autoscaling/api_client.go b/service/autoscaling/api_client.go index c53c61d4884..65512c93942 100644 --- a/service/autoscaling/api_client.go +++ b/service/autoscaling/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/autoscalingplans/api_client.go b/service/autoscalingplans/api_client.go index 32010bb4b62..2a1d0846ba7 100644 --- a/service/autoscalingplans/api_client.go +++ b/service/autoscalingplans/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/backup/api_client.go b/service/backup/api_client.go index f6780c7eb8c..ede33375980 100644 --- a/service/backup/api_client.go +++ b/service/backup/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/batch/api_client.go b/service/batch/api_client.go index d1537e9f00f..7315ec8448f 100644 --- a/service/batch/api_client.go +++ b/service/batch/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/braket/api_client.go b/service/braket/api_client.go index 8ab151e7add..61d827a6a92 100644 --- a/service/braket/api_client.go +++ b/service/braket/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/budgets/api_client.go b/service/budgets/api_client.go index 3a180ae1abe..5f28ff4be6f 100644 --- a/service/budgets/api_client.go +++ b/service/budgets/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/chime/api_client.go b/service/chime/api_client.go index ef64624435a..7b97bdce0af 100644 --- a/service/chime/api_client.go +++ b/service/chime/api_client.go @@ -190,11 +190,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -202,9 +207,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/cloud9/api_client.go b/service/cloud9/api_client.go index 07e0304400f..0c978396c82 100644 --- a/service/cloud9/api_client.go +++ b/service/cloud9/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/clouddirectory/api_client.go b/service/clouddirectory/api_client.go index ad89b0af56d..1e3b95ad648 100644 --- a/service/clouddirectory/api_client.go +++ b/service/clouddirectory/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/cloudformation/api_client.go b/service/cloudformation/api_client.go index 7811ee8836d..fd8c0419cbc 100644 --- a/service/cloudformation/api_client.go +++ b/service/cloudformation/api_client.go @@ -190,11 +190,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -202,9 +207,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/cloudfront/api_client.go b/service/cloudfront/api_client.go index 19e7c096139..1fa80deccd5 100644 --- a/service/cloudfront/api_client.go +++ b/service/cloudfront/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/cloudhsm/api_client.go b/service/cloudhsm/api_client.go index b93a359693b..d287cb4acb9 100644 --- a/service/cloudhsm/api_client.go +++ b/service/cloudhsm/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/cloudhsmv2/api_client.go b/service/cloudhsmv2/api_client.go index 17b85492439..234a7823391 100644 --- a/service/cloudhsmv2/api_client.go +++ b/service/cloudhsmv2/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/cloudsearch/api_client.go b/service/cloudsearch/api_client.go index 4a4e2d0f8dd..081c364787e 100644 --- a/service/cloudsearch/api_client.go +++ b/service/cloudsearch/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/cloudsearchdomain/api_client.go b/service/cloudsearchdomain/api_client.go index fde7d1c0cb8..6f203ca6092 100644 --- a/service/cloudsearchdomain/api_client.go +++ b/service/cloudsearchdomain/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/cloudtrail/api_client.go b/service/cloudtrail/api_client.go index 5415dfea33e..41b7fb59626 100644 --- a/service/cloudtrail/api_client.go +++ b/service/cloudtrail/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/cloudwatch/api_client.go b/service/cloudwatch/api_client.go index 2eba6fae41f..1168e28efce 100644 --- a/service/cloudwatch/api_client.go +++ b/service/cloudwatch/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/cloudwatchevents/api_client.go b/service/cloudwatchevents/api_client.go index 6b8d9042568..921bd8ffed2 100644 --- a/service/cloudwatchevents/api_client.go +++ b/service/cloudwatchevents/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/cloudwatchlogs/api_client.go b/service/cloudwatchlogs/api_client.go index 3aee2b0282d..5d01b529423 100644 --- a/service/cloudwatchlogs/api_client.go +++ b/service/cloudwatchlogs/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/codeartifact/api_client.go b/service/codeartifact/api_client.go index 97be1ea2aa9..779d2c554b6 100644 --- a/service/codeartifact/api_client.go +++ b/service/codeartifact/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/codebuild/api_client.go b/service/codebuild/api_client.go index 9be2a5aa697..45ed45737ac 100644 --- a/service/codebuild/api_client.go +++ b/service/codebuild/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/codecommit/api_client.go b/service/codecommit/api_client.go index da0e59e65f3..550fcc06fbf 100644 --- a/service/codecommit/api_client.go +++ b/service/codecommit/api_client.go @@ -190,11 +190,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -202,9 +207,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/codedeploy/api_client.go b/service/codedeploy/api_client.go index 97a6a9467e1..82b97fc1513 100644 --- a/service/codedeploy/api_client.go +++ b/service/codedeploy/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/codeguruprofiler/api_client.go b/service/codeguruprofiler/api_client.go index be953574872..53d0f0a2d38 100644 --- a/service/codeguruprofiler/api_client.go +++ b/service/codeguruprofiler/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/codegurureviewer/api_client.go b/service/codegurureviewer/api_client.go index 786a871e54c..e5987d1a0da 100644 --- a/service/codegurureviewer/api_client.go +++ b/service/codegurureviewer/api_client.go @@ -191,11 +191,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -203,9 +208,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/codepipeline/api_client.go b/service/codepipeline/api_client.go index 6f2b4c45e2e..2841c45f43c 100644 --- a/service/codepipeline/api_client.go +++ b/service/codepipeline/api_client.go @@ -190,11 +190,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -202,9 +207,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/codestar/api_client.go b/service/codestar/api_client.go index 30f462f21ab..ecce2e446dc 100644 --- a/service/codestar/api_client.go +++ b/service/codestar/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/codestarconnections/api_client.go b/service/codestarconnections/api_client.go index f54482c1e0e..b43406218c5 100644 --- a/service/codestarconnections/api_client.go +++ b/service/codestarconnections/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/codestarnotifications/api_client.go b/service/codestarnotifications/api_client.go index f488fac062d..25685fb7feb 100644 --- a/service/codestarnotifications/api_client.go +++ b/service/codestarnotifications/api_client.go @@ -191,11 +191,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -203,9 +208,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/cognitoidentity/api_client.go b/service/cognitoidentity/api_client.go index beac39446b1..c51abea2260 100644 --- a/service/cognitoidentity/api_client.go +++ b/service/cognitoidentity/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/cognitoidentityprovider/api_client.go b/service/cognitoidentityprovider/api_client.go index 5a26655b7f9..d3be7549d8d 100644 --- a/service/cognitoidentityprovider/api_client.go +++ b/service/cognitoidentityprovider/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/cognitosync/api_client.go b/service/cognitosync/api_client.go index f056100066e..4cf5e182148 100644 --- a/service/cognitosync/api_client.go +++ b/service/cognitosync/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/comprehend/api_client.go b/service/comprehend/api_client.go index cadb12c9659..dfaf5fc3d56 100644 --- a/service/comprehend/api_client.go +++ b/service/comprehend/api_client.go @@ -190,11 +190,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -202,9 +207,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/comprehendmedical/api_client.go b/service/comprehendmedical/api_client.go index 0d932a9e8a6..c1d9d665c03 100644 --- a/service/comprehendmedical/api_client.go +++ b/service/comprehendmedical/api_client.go @@ -191,11 +191,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -203,9 +208,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/computeoptimizer/api_client.go b/service/computeoptimizer/api_client.go index a092556306c..5b9c3417ea0 100644 --- a/service/computeoptimizer/api_client.go +++ b/service/computeoptimizer/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/configservice/api_client.go b/service/configservice/api_client.go index 261bef59e2e..9ad63ccb53d 100644 --- a/service/configservice/api_client.go +++ b/service/configservice/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/connect/api_client.go b/service/connect/api_client.go index e217e7149fd..a311088e603 100644 --- a/service/connect/api_client.go +++ b/service/connect/api_client.go @@ -191,11 +191,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -203,9 +208,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/connectparticipant/api_client.go b/service/connectparticipant/api_client.go index 698e70d4475..61e0321d0f4 100644 --- a/service/connectparticipant/api_client.go +++ b/service/connectparticipant/api_client.go @@ -191,11 +191,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -203,9 +208,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/costandusagereportservice/api_client.go b/service/costandusagereportservice/api_client.go index 06a33be9dfe..f55761370dd 100644 --- a/service/costandusagereportservice/api_client.go +++ b/service/costandusagereportservice/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/costexplorer/api_client.go b/service/costexplorer/api_client.go index a0791fb7091..810a05dd692 100644 --- a/service/costexplorer/api_client.go +++ b/service/costexplorer/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/databasemigrationservice/api_client.go b/service/databasemigrationservice/api_client.go index 76c2b1da2f2..f1e940f0854 100644 --- a/service/databasemigrationservice/api_client.go +++ b/service/databasemigrationservice/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/databrew/api_client.go b/service/databrew/api_client.go index 04d702ca5c6..df54448f769 100644 --- a/service/databrew/api_client.go +++ b/service/databrew/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/dataexchange/api_client.go b/service/dataexchange/api_client.go index c56e0b21e90..9a717e6414c 100644 --- a/service/dataexchange/api_client.go +++ b/service/dataexchange/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/datapipeline/api_client.go b/service/datapipeline/api_client.go index 5f224211831..459a35cf574 100644 --- a/service/datapipeline/api_client.go +++ b/service/datapipeline/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/datasync/api_client.go b/service/datasync/api_client.go index 9542ee9f4d3..d0e8f65e445 100644 --- a/service/datasync/api_client.go +++ b/service/datasync/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/dax/api_client.go b/service/dax/api_client.go index c9ead59a721..0a240485be8 100644 --- a/service/dax/api_client.go +++ b/service/dax/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/detective/api_client.go b/service/detective/api_client.go index 0a3d7b19467..0a3cc08f183 100644 --- a/service/detective/api_client.go +++ b/service/detective/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/devicefarm/api_client.go b/service/devicefarm/api_client.go index c5ee3bb2b6d..3755feaed66 100644 --- a/service/devicefarm/api_client.go +++ b/service/devicefarm/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/directconnect/api_client.go b/service/directconnect/api_client.go index d901dae7411..ae9aa09139e 100644 --- a/service/directconnect/api_client.go +++ b/service/directconnect/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/directoryservice/api_client.go b/service/directoryservice/api_client.go index 23113df74eb..582f391a7bd 100644 --- a/service/directoryservice/api_client.go +++ b/service/directoryservice/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/dlm/api_client.go b/service/dlm/api_client.go index 4639f8f5eac..7f724712795 100644 --- a/service/dlm/api_client.go +++ b/service/dlm/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/docdb/api_client.go b/service/docdb/api_client.go index 6b8df8b12df..99e31637b0c 100644 --- a/service/docdb/api_client.go +++ b/service/docdb/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/dynamodb/api_client.go b/service/dynamodb/api_client.go index 29224f848f4..781c36df6bc 100644 --- a/service/dynamodb/api_client.go +++ b/service/dynamodb/api_client.go @@ -200,11 +200,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -212,9 +217,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/dynamodbstreams/api_client.go b/service/dynamodbstreams/api_client.go index 1b708761512..a1e4c5914ff 100644 --- a/service/dynamodbstreams/api_client.go +++ b/service/dynamodbstreams/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/ebs/api_client.go b/service/ebs/api_client.go index d2a75f3c8c0..960334e45fc 100644 --- a/service/ebs/api_client.go +++ b/service/ebs/api_client.go @@ -191,11 +191,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -203,9 +208,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/ec2/api_client.go b/service/ec2/api_client.go index 3b4c1d0b7be..95e2c3bb0df 100644 --- a/service/ec2/api_client.go +++ b/service/ec2/api_client.go @@ -192,11 +192,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -204,9 +209,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } @@ -253,6 +258,7 @@ type HTTPPresignerV4 interface { PresignHTTP( ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, + optFns ...func(*v4.SignerOptions), ) (url string, signedHeader http.Header, err error) } @@ -311,7 +317,12 @@ func (c *PresignClient) convertToPresignMiddleware(stack *middleware.Stack, opti stack.Finalize.Clear() stack.Deserialize.Clear() stack.Build.Remove((*awsmiddleware.ClientRequestID)(nil).ID()) - err = stack.Finalize.Add(v4.NewPresignHTTPRequestMiddleware(options.Credentials, c.presigner), middleware.After) + pmw := v4.NewPresignHTTPRequestMiddleware(v4.PresignHTTPRequestMiddlewareOptions{ + CredentialsProvider: options.Credentials, + Presigner: c.presigner, + LogSigning: options.ClientLogMode.IsSigning(), + }) + err = stack.Finalize.Add(pmw, middleware.After) if err != nil { return err } diff --git a/service/ec2instanceconnect/api_client.go b/service/ec2instanceconnect/api_client.go index ac4bf841078..99f9e124645 100644 --- a/service/ec2instanceconnect/api_client.go +++ b/service/ec2instanceconnect/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/ecr/api_client.go b/service/ecr/api_client.go index b5485c69fd4..6edf33cba2d 100644 --- a/service/ecr/api_client.go +++ b/service/ecr/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/ecs/api_client.go b/service/ecs/api_client.go index 756a79b5f89..8f4c226d35d 100644 --- a/service/ecs/api_client.go +++ b/service/ecs/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/efs/api_client.go b/service/efs/api_client.go index 5a2698e2462..ca3666aaac7 100644 --- a/service/efs/api_client.go +++ b/service/efs/api_client.go @@ -191,11 +191,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -203,9 +208,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/eks/api_client.go b/service/eks/api_client.go index d16de659ae4..87043b79feb 100644 --- a/service/eks/api_client.go +++ b/service/eks/api_client.go @@ -191,11 +191,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -203,9 +208,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/elasticache/api_client.go b/service/elasticache/api_client.go index c96718f76c1..6fa26ba8efe 100644 --- a/service/elasticache/api_client.go +++ b/service/elasticache/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/elasticbeanstalk/api_client.go b/service/elasticbeanstalk/api_client.go index e54a27e24fb..23af0d2cc2a 100644 --- a/service/elasticbeanstalk/api_client.go +++ b/service/elasticbeanstalk/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/elasticinference/api_client.go b/service/elasticinference/api_client.go index 18fd3f1caf0..ab79a998f1c 100644 --- a/service/elasticinference/api_client.go +++ b/service/elasticinference/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/elasticloadbalancing/api_client.go b/service/elasticloadbalancing/api_client.go index be3b9239895..005d4c9e86f 100644 --- a/service/elasticloadbalancing/api_client.go +++ b/service/elasticloadbalancing/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/elasticloadbalancingv2/api_client.go b/service/elasticloadbalancingv2/api_client.go index 41d30352950..4e7395211fc 100644 --- a/service/elasticloadbalancingv2/api_client.go +++ b/service/elasticloadbalancingv2/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/elasticsearchservice/api_client.go b/service/elasticsearchservice/api_client.go index 348537de70d..c0c37d16ae0 100644 --- a/service/elasticsearchservice/api_client.go +++ b/service/elasticsearchservice/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/elastictranscoder/api_client.go b/service/elastictranscoder/api_client.go index 336e7e1787f..d3c1de5d961 100644 --- a/service/elastictranscoder/api_client.go +++ b/service/elastictranscoder/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/emr/api_client.go b/service/emr/api_client.go index d4ec08e32d8..ccc7a7f7464 100644 --- a/service/emr/api_client.go +++ b/service/emr/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/eventbridge/api_client.go b/service/eventbridge/api_client.go index 16d5989042d..51b6e87701d 100644 --- a/service/eventbridge/api_client.go +++ b/service/eventbridge/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/firehose/api_client.go b/service/firehose/api_client.go index 34cc65e7302..dcffd3fe363 100644 --- a/service/firehose/api_client.go +++ b/service/firehose/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/fms/api_client.go b/service/fms/api_client.go index 9bdedca4aac..0be96df533e 100644 --- a/service/fms/api_client.go +++ b/service/fms/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/forecast/api_client.go b/service/forecast/api_client.go index 00382bc322d..a8fb2af74d5 100644 --- a/service/forecast/api_client.go +++ b/service/forecast/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/forecastquery/api_client.go b/service/forecastquery/api_client.go index 068f978fb11..d1d299a5e2d 100644 --- a/service/forecastquery/api_client.go +++ b/service/forecastquery/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/frauddetector/api_client.go b/service/frauddetector/api_client.go index e2656c54acd..f8ede58c7e2 100644 --- a/service/frauddetector/api_client.go +++ b/service/frauddetector/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/fsx/api_client.go b/service/fsx/api_client.go index 5b2eca00971..590526e55ee 100644 --- a/service/fsx/api_client.go +++ b/service/fsx/api_client.go @@ -190,11 +190,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -202,9 +207,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/gamelift/api_client.go b/service/gamelift/api_client.go index 9535a2fbdb1..62f5ef78c59 100644 --- a/service/gamelift/api_client.go +++ b/service/gamelift/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/glacier/api_client.go b/service/glacier/api_client.go index fb6ff386781..dbc1bc4e524 100644 --- a/service/glacier/api_client.go +++ b/service/glacier/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/globalaccelerator/api_client.go b/service/globalaccelerator/api_client.go index 9c2eb45d999..e1e8ce79f05 100644 --- a/service/globalaccelerator/api_client.go +++ b/service/globalaccelerator/api_client.go @@ -191,11 +191,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -203,9 +208,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/glue/api_client.go b/service/glue/api_client.go index fe65ba80ae0..49b4a91edb8 100644 --- a/service/glue/api_client.go +++ b/service/glue/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/greengrass/api_client.go b/service/greengrass/api_client.go index d952ea60ab2..c720f26feb4 100644 --- a/service/greengrass/api_client.go +++ b/service/greengrass/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/groundstation/api_client.go b/service/groundstation/api_client.go index a5e37a70970..d39a306bffc 100644 --- a/service/groundstation/api_client.go +++ b/service/groundstation/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/guardduty/api_client.go b/service/guardduty/api_client.go index 635fe51206d..f5ed0dcb0f3 100644 --- a/service/guardduty/api_client.go +++ b/service/guardduty/api_client.go @@ -190,11 +190,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -202,9 +207,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/health/api_client.go b/service/health/api_client.go index 4537e57d5b7..7fe48a47b9d 100644 --- a/service/health/api_client.go +++ b/service/health/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/honeycode/api_client.go b/service/honeycode/api_client.go index ab33414e502..2245c21e7a5 100644 --- a/service/honeycode/api_client.go +++ b/service/honeycode/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/iam/api_client.go b/service/iam/api_client.go index 1cb0cda5cf2..05d435287e3 100644 --- a/service/iam/api_client.go +++ b/service/iam/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/identitystore/api_client.go b/service/identitystore/api_client.go index 7212c92fda9..8e754fe566e 100644 --- a/service/identitystore/api_client.go +++ b/service/identitystore/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/imagebuilder/api_client.go b/service/imagebuilder/api_client.go index 936ab521857..f26f5fe3249 100644 --- a/service/imagebuilder/api_client.go +++ b/service/imagebuilder/api_client.go @@ -190,11 +190,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -202,9 +207,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/inspector/api_client.go b/service/inspector/api_client.go index b04edd25a39..460483816de 100644 --- a/service/inspector/api_client.go +++ b/service/inspector/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/internal/benchmark/go.mod b/service/internal/benchmark/go.mod index 6a153cb4d7c..e1be27aa04a 100644 --- a/service/internal/benchmark/go.mod +++ b/service/internal/benchmark/go.mod @@ -8,7 +8,6 @@ require ( github.com/aws/aws-sdk-go-v2/service/dynamodb v0.30.0 github.com/aws/aws-sdk-go-v2/service/lexruntimeservice v0.30.0 github.com/awslabs/smithy-go v0.4.0 - github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v0.3.1 ) replace github.com/aws/aws-sdk-go-v2 => ../../../ diff --git a/service/internal/integrationtest/go.mod b/service/internal/integrationtest/go.mod index d7ec343fb7d..343d60dd7f9 100644 --- a/service/internal/integrationtest/go.mod +++ b/service/internal/integrationtest/go.mod @@ -50,8 +50,6 @@ require ( github.com/aws/aws-sdk-go-v2/service/health v0.30.0 github.com/aws/aws-sdk-go-v2/service/iam v0.30.0 github.com/aws/aws-sdk-go-v2/service/inspector v0.30.0 - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v0.1.2 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v0.3.2 // indirect github.com/aws/aws-sdk-go-v2/service/iot v0.30.0 github.com/aws/aws-sdk-go-v2/service/kinesis v0.30.0 github.com/aws/aws-sdk-go-v2/service/kms v0.30.0 @@ -88,9 +86,6 @@ require ( github.com/aws/aws-sdk-go-v2/service/workspaces v0.30.0 github.com/awslabs/smithy-go v0.4.0 github.com/google/go-cmp v0.5.4 - github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v0.3.1 - github.com/aws/aws-sdk-go-v2/credentials v0.1.5 - github.com/aws/aws-sdk-go-v2/ec2imds v0.1.5 ) go 1.15 diff --git a/service/iot/api_client.go b/service/iot/api_client.go index 90cd8f8f918..f1279655505 100644 --- a/service/iot/api_client.go +++ b/service/iot/api_client.go @@ -190,11 +190,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -202,9 +207,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/iot1clickdevicesservice/api_client.go b/service/iot1clickdevicesservice/api_client.go index 14b58001079..1bacecc6d8b 100644 --- a/service/iot1clickdevicesservice/api_client.go +++ b/service/iot1clickdevicesservice/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/iot1clickprojects/api_client.go b/service/iot1clickprojects/api_client.go index f21de276df9..4d29537d71f 100644 --- a/service/iot1clickprojects/api_client.go +++ b/service/iot1clickprojects/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/iotanalytics/api_client.go b/service/iotanalytics/api_client.go index 33d99f80e4c..3c663ca76b4 100644 --- a/service/iotanalytics/api_client.go +++ b/service/iotanalytics/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/iotdataplane/api_client.go b/service/iotdataplane/api_client.go index c72f68630c6..37575e9661e 100644 --- a/service/iotdataplane/api_client.go +++ b/service/iotdataplane/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/iotevents/api_client.go b/service/iotevents/api_client.go index e0acc6748ed..33188c8d124 100644 --- a/service/iotevents/api_client.go +++ b/service/iotevents/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/ioteventsdata/api_client.go b/service/ioteventsdata/api_client.go index dc7b16f5715..ff06f7f8399 100644 --- a/service/ioteventsdata/api_client.go +++ b/service/ioteventsdata/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/iotjobsdataplane/api_client.go b/service/iotjobsdataplane/api_client.go index 7deab0f717c..73ccf5dfb12 100644 --- a/service/iotjobsdataplane/api_client.go +++ b/service/iotjobsdataplane/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/iotsecuretunneling/api_client.go b/service/iotsecuretunneling/api_client.go index ead0a59eb41..919a1b5017e 100644 --- a/service/iotsecuretunneling/api_client.go +++ b/service/iotsecuretunneling/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/iotsitewise/api_client.go b/service/iotsitewise/api_client.go index fd05ec1938e..d2c89bf8f19 100644 --- a/service/iotsitewise/api_client.go +++ b/service/iotsitewise/api_client.go @@ -190,11 +190,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -202,9 +207,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/iotthingsgraph/api_client.go b/service/iotthingsgraph/api_client.go index 79d91ac39e4..5f9c5c24156 100644 --- a/service/iotthingsgraph/api_client.go +++ b/service/iotthingsgraph/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/ivs/api_client.go b/service/ivs/api_client.go index 732676bccea..92064f99a06 100644 --- a/service/ivs/api_client.go +++ b/service/ivs/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/kafka/api_client.go b/service/kafka/api_client.go index 49217770cad..e0554045391 100644 --- a/service/kafka/api_client.go +++ b/service/kafka/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/kendra/api_client.go b/service/kendra/api_client.go index 2b786119e00..ae6a0ce19cb 100644 --- a/service/kendra/api_client.go +++ b/service/kendra/api_client.go @@ -191,11 +191,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -203,9 +208,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/kinesis/api_client.go b/service/kinesis/api_client.go index 1fc91b0dab8..b802d7bd5b4 100644 --- a/service/kinesis/api_client.go +++ b/service/kinesis/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/kinesisanalytics/api_client.go b/service/kinesisanalytics/api_client.go index e4480b327ed..3b23fd29bfa 100644 --- a/service/kinesisanalytics/api_client.go +++ b/service/kinesisanalytics/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/kinesisanalyticsv2/api_client.go b/service/kinesisanalyticsv2/api_client.go index 1d63c4335d2..d1e0e63bc8a 100644 --- a/service/kinesisanalyticsv2/api_client.go +++ b/service/kinesisanalyticsv2/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/kinesisvideo/api_client.go b/service/kinesisvideo/api_client.go index 49aa123b625..c2022b81518 100644 --- a/service/kinesisvideo/api_client.go +++ b/service/kinesisvideo/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/kinesisvideoarchivedmedia/api_client.go b/service/kinesisvideoarchivedmedia/api_client.go index 239c4ca9f19..52bf9e5da6b 100644 --- a/service/kinesisvideoarchivedmedia/api_client.go +++ b/service/kinesisvideoarchivedmedia/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/kinesisvideomedia/api_client.go b/service/kinesisvideomedia/api_client.go index dc3568c32aa..1bd704299f4 100644 --- a/service/kinesisvideomedia/api_client.go +++ b/service/kinesisvideomedia/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/kinesisvideosignaling/api_client.go b/service/kinesisvideosignaling/api_client.go index 476a78e95d1..e5757cff3a6 100644 --- a/service/kinesisvideosignaling/api_client.go +++ b/service/kinesisvideosignaling/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/kms/api_client.go b/service/kms/api_client.go index 146a88086dd..e45d3992449 100644 --- a/service/kms/api_client.go +++ b/service/kms/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/lakeformation/api_client.go b/service/lakeformation/api_client.go index 3328a057117..003a79d5aaf 100644 --- a/service/lakeformation/api_client.go +++ b/service/lakeformation/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/lambda/api_client.go b/service/lambda/api_client.go index 41754997dd8..b5d5ebf5723 100644 --- a/service/lambda/api_client.go +++ b/service/lambda/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/lexmodelbuildingservice/api_client.go b/service/lexmodelbuildingservice/api_client.go index e4e49162edf..2ca13722396 100644 --- a/service/lexmodelbuildingservice/api_client.go +++ b/service/lexmodelbuildingservice/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/lexruntimeservice/api_client.go b/service/lexruntimeservice/api_client.go index 92c0456c8a9..998c61e6861 100644 --- a/service/lexruntimeservice/api_client.go +++ b/service/lexruntimeservice/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/licensemanager/api_client.go b/service/licensemanager/api_client.go index 638e261194f..88743b1b65c 100644 --- a/service/licensemanager/api_client.go +++ b/service/licensemanager/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/lightsail/api_client.go b/service/lightsail/api_client.go index 56c76af1bdb..97ee3d5f0a0 100644 --- a/service/lightsail/api_client.go +++ b/service/lightsail/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/machinelearning/api_client.go b/service/machinelearning/api_client.go index b4e215312d4..53df804776d 100644 --- a/service/machinelearning/api_client.go +++ b/service/machinelearning/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/macie/api_client.go b/service/macie/api_client.go index 6355311c4dd..e73f05c1c6a 100644 --- a/service/macie/api_client.go +++ b/service/macie/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/macie2/api_client.go b/service/macie2/api_client.go index 2d260898b0a..03878125a58 100644 --- a/service/macie2/api_client.go +++ b/service/macie2/api_client.go @@ -190,11 +190,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -202,9 +207,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/managedblockchain/api_client.go b/service/managedblockchain/api_client.go index c30eef35283..c278896f80d 100644 --- a/service/managedblockchain/api_client.go +++ b/service/managedblockchain/api_client.go @@ -191,11 +191,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -203,9 +208,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/marketplacecatalog/api_client.go b/service/marketplacecatalog/api_client.go index 36c3ea52959..dabc6f66d0c 100644 --- a/service/marketplacecatalog/api_client.go +++ b/service/marketplacecatalog/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/marketplacecommerceanalytics/api_client.go b/service/marketplacecommerceanalytics/api_client.go index 64106f09b32..b2b0a88df96 100644 --- a/service/marketplacecommerceanalytics/api_client.go +++ b/service/marketplacecommerceanalytics/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/marketplaceentitlementservice/api_client.go b/service/marketplaceentitlementservice/api_client.go index d761e3d8ba0..740f23d18ff 100644 --- a/service/marketplaceentitlementservice/api_client.go +++ b/service/marketplaceentitlementservice/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/marketplacemetering/api_client.go b/service/marketplacemetering/api_client.go index fe6758f7c2d..475faca32e5 100644 --- a/service/marketplacemetering/api_client.go +++ b/service/marketplacemetering/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/mediaconnect/api_client.go b/service/mediaconnect/api_client.go index 257f489a416..c4805c2e1ae 100644 --- a/service/mediaconnect/api_client.go +++ b/service/mediaconnect/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/mediaconvert/api_client.go b/service/mediaconvert/api_client.go index 74cd5ceba17..b9bf4c9b22d 100644 --- a/service/mediaconvert/api_client.go +++ b/service/mediaconvert/api_client.go @@ -191,11 +191,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -203,9 +208,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/medialive/api_client.go b/service/medialive/api_client.go index 750dc7660b3..0bc174a417d 100644 --- a/service/medialive/api_client.go +++ b/service/medialive/api_client.go @@ -191,11 +191,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -203,9 +208,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/mediapackage/api_client.go b/service/mediapackage/api_client.go index 40ad269c48d..90e09a94d07 100644 --- a/service/mediapackage/api_client.go +++ b/service/mediapackage/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/mediapackagevod/api_client.go b/service/mediapackagevod/api_client.go index cc7088f9725..f68ebb8f8da 100644 --- a/service/mediapackagevod/api_client.go +++ b/service/mediapackagevod/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/mediastore/api_client.go b/service/mediastore/api_client.go index c4c4a6418b3..da1ca4161c3 100644 --- a/service/mediastore/api_client.go +++ b/service/mediastore/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/mediastoredata/api_client.go b/service/mediastoredata/api_client.go index 1471a4dc020..de316677513 100644 --- a/service/mediastoredata/api_client.go +++ b/service/mediastoredata/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/mediatailor/api_client.go b/service/mediatailor/api_client.go index fd85d23d0bc..6721e5d8b45 100644 --- a/service/mediatailor/api_client.go +++ b/service/mediatailor/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/migrationhub/api_client.go b/service/migrationhub/api_client.go index 5e73a22f582..546ad99326b 100644 --- a/service/migrationhub/api_client.go +++ b/service/migrationhub/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/migrationhubconfig/api_client.go b/service/migrationhubconfig/api_client.go index d4f81a80cbb..274949762f7 100644 --- a/service/migrationhubconfig/api_client.go +++ b/service/migrationhubconfig/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/mobile/api_client.go b/service/mobile/api_client.go index 8a54e1ad639..c16e1bb2ca3 100644 --- a/service/mobile/api_client.go +++ b/service/mobile/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/mq/api_client.go b/service/mq/api_client.go index 728a95c800d..95442056206 100644 --- a/service/mq/api_client.go +++ b/service/mq/api_client.go @@ -190,11 +190,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -202,9 +207,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/mturk/api_client.go b/service/mturk/api_client.go index 916ba63b641..dea731c5844 100644 --- a/service/mturk/api_client.go +++ b/service/mturk/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/neptune/api_client.go b/service/neptune/api_client.go index 8ef9da81013..3cf72360fbb 100644 --- a/service/neptune/api_client.go +++ b/service/neptune/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/networkfirewall/api_client.go b/service/networkfirewall/api_client.go index c1a36f1d36d..e60ac433309 100644 --- a/service/networkfirewall/api_client.go +++ b/service/networkfirewall/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/networkmanager/api_client.go b/service/networkmanager/api_client.go index fad85dc24da..bdbc72304fc 100644 --- a/service/networkmanager/api_client.go +++ b/service/networkmanager/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/opsworks/api_client.go b/service/opsworks/api_client.go index 33a7eed196c..a97f7f1271d 100644 --- a/service/opsworks/api_client.go +++ b/service/opsworks/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/opsworkscm/api_client.go b/service/opsworkscm/api_client.go index 6b4296f6216..afac80c371d 100644 --- a/service/opsworkscm/api_client.go +++ b/service/opsworkscm/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/organizations/api_client.go b/service/organizations/api_client.go index 7467538772b..7638b1f3b77 100644 --- a/service/organizations/api_client.go +++ b/service/organizations/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/outposts/api_client.go b/service/outposts/api_client.go index b7aef0c9855..25bbe93fe2f 100644 --- a/service/outposts/api_client.go +++ b/service/outposts/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/personalize/api_client.go b/service/personalize/api_client.go index 0f1b5cf18a1..51e125f4a87 100644 --- a/service/personalize/api_client.go +++ b/service/personalize/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/personalizeevents/api_client.go b/service/personalizeevents/api_client.go index d5f091d0448..e582d83747d 100644 --- a/service/personalizeevents/api_client.go +++ b/service/personalizeevents/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/personalizeruntime/api_client.go b/service/personalizeruntime/api_client.go index ca262fa5f2e..44f6487adac 100644 --- a/service/personalizeruntime/api_client.go +++ b/service/personalizeruntime/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/pi/api_client.go b/service/pi/api_client.go index b512afc30e0..627df487807 100644 --- a/service/pi/api_client.go +++ b/service/pi/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/pinpoint/api_client.go b/service/pinpoint/api_client.go index be5078aa481..154a7877639 100644 --- a/service/pinpoint/api_client.go +++ b/service/pinpoint/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/pinpointemail/api_client.go b/service/pinpointemail/api_client.go index 876de0e21be..65c727ce3ff 100644 --- a/service/pinpointemail/api_client.go +++ b/service/pinpointemail/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/pinpointsmsvoice/api_client.go b/service/pinpointsmsvoice/api_client.go index b7d07fb9fd5..6b7886870b5 100644 --- a/service/pinpointsmsvoice/api_client.go +++ b/service/pinpointsmsvoice/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/polly/api_client.go b/service/polly/api_client.go index e94ed8db472..ca57a537f16 100644 --- a/service/polly/api_client.go +++ b/service/polly/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/pricing/api_client.go b/service/pricing/api_client.go index 34181abf167..3049bbf8067 100644 --- a/service/pricing/api_client.go +++ b/service/pricing/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/qldb/api_client.go b/service/qldb/api_client.go index 904cc3f0706..3f756345048 100644 --- a/service/qldb/api_client.go +++ b/service/qldb/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/qldbsession/api_client.go b/service/qldbsession/api_client.go index d6931ab3520..96e2309b41c 100644 --- a/service/qldbsession/api_client.go +++ b/service/qldbsession/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/quicksight/api_client.go b/service/quicksight/api_client.go index 15d0c53c4b4..bdc68b57fdf 100644 --- a/service/quicksight/api_client.go +++ b/service/quicksight/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/ram/api_client.go b/service/ram/api_client.go index 495546df65c..4c55bd8a83a 100644 --- a/service/ram/api_client.go +++ b/service/ram/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/rds/api_client.go b/service/rds/api_client.go index cd36a219da5..9d048e77852 100644 --- a/service/rds/api_client.go +++ b/service/rds/api_client.go @@ -184,11 +184,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -196,9 +201,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } @@ -233,6 +238,7 @@ type HTTPPresignerV4 interface { PresignHTTP( ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, + optFns ...func(*v4.SignerOptions), ) (url string, signedHeader http.Header, err error) } @@ -291,7 +297,12 @@ func (c *PresignClient) convertToPresignMiddleware(stack *middleware.Stack, opti stack.Finalize.Clear() stack.Deserialize.Clear() stack.Build.Remove((*awsmiddleware.ClientRequestID)(nil).ID()) - err = stack.Finalize.Add(v4.NewPresignHTTPRequestMiddleware(options.Credentials, c.presigner), middleware.After) + pmw := v4.NewPresignHTTPRequestMiddleware(v4.PresignHTTPRequestMiddlewareOptions{ + CredentialsProvider: options.Credentials, + Presigner: c.presigner, + LogSigning: options.ClientLogMode.IsSigning(), + }) + err = stack.Finalize.Add(pmw, middleware.After) if err != nil { return err } diff --git a/service/rdsdata/api_client.go b/service/rdsdata/api_client.go index fe907e07266..6858f4db74a 100644 --- a/service/rdsdata/api_client.go +++ b/service/rdsdata/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/redshift/api_client.go b/service/redshift/api_client.go index d183b7614cd..829b825fb3f 100644 --- a/service/redshift/api_client.go +++ b/service/redshift/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/redshiftdata/api_client.go b/service/redshiftdata/api_client.go index 46f4ae0a3cd..2e4db8f60ea 100644 --- a/service/redshiftdata/api_client.go +++ b/service/redshiftdata/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/rekognition/api_client.go b/service/rekognition/api_client.go index 8e47d23ed81..063f0c43e94 100644 --- a/service/rekognition/api_client.go +++ b/service/rekognition/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/resourcegroups/api_client.go b/service/resourcegroups/api_client.go index 629ef6e1dbb..aa3c06ab67a 100644 --- a/service/resourcegroups/api_client.go +++ b/service/resourcegroups/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/resourcegroupstaggingapi/api_client.go b/service/resourcegroupstaggingapi/api_client.go index 935a7d77b85..4db4e072509 100644 --- a/service/resourcegroupstaggingapi/api_client.go +++ b/service/resourcegroupstaggingapi/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/robomaker/api_client.go b/service/robomaker/api_client.go index de8f69b693c..2dafe2a8324 100644 --- a/service/robomaker/api_client.go +++ b/service/robomaker/api_client.go @@ -190,11 +190,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -202,9 +207,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/route53/api_client.go b/service/route53/api_client.go index 18e31b9fe4c..a8b41bbcc1d 100644 --- a/service/route53/api_client.go +++ b/service/route53/api_client.go @@ -184,11 +184,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -196,9 +201,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/route53domains/api_client.go b/service/route53domains/api_client.go index c9b4a74e738..a92003bf327 100644 --- a/service/route53domains/api_client.go +++ b/service/route53domains/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/route53resolver/api_client.go b/service/route53resolver/api_client.go index 2e0361324d8..9816e463893 100644 --- a/service/route53resolver/api_client.go +++ b/service/route53resolver/api_client.go @@ -191,11 +191,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -203,9 +208,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/s3/api_client.go b/service/s3/api_client.go index b52d80b46d0..5d93f4e8544 100644 --- a/service/s3/api_client.go +++ b/service/s3/api_client.go @@ -205,11 +205,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -217,10 +222,10 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() - s.DisableURIPathEscaping = true + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() + so.DisableURIPathEscaping = true }, ) } @@ -265,6 +270,7 @@ type HTTPPresignerV4 interface { PresignHTTP( ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, + optFns ...func(*v4.SignerOptions), ) (url string, signedHeader http.Header, err error) } @@ -342,7 +348,12 @@ func (c *PresignClient) convertToPresignMiddleware(stack *middleware.Stack, opti stack.Finalize.Clear() stack.Deserialize.Clear() stack.Build.Remove((*awsmiddleware.ClientRequestID)(nil).ID()) - err = stack.Finalize.Add(v4.NewPresignHTTPRequestMiddleware(options.Credentials, c.presigner), middleware.After) + pmw := v4.NewPresignHTTPRequestMiddleware(v4.PresignHTTPRequestMiddlewareOptions{ + CredentialsProvider: options.Credentials, + Presigner: c.presigner, + LogSigning: options.ClientLogMode.IsSigning(), + }) + err = stack.Finalize.Add(pmw, middleware.After) if err != nil { return err } diff --git a/service/s3/internal/configtesting/go.mod b/service/s3/internal/configtesting/go.mod index 0a53866b913..7a5f1eeb0ac 100644 --- a/service/s3/internal/configtesting/go.mod +++ b/service/s3/internal/configtesting/go.mod @@ -5,13 +5,6 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2/config v0.3.0 github.com/aws/aws-sdk-go-v2/service/s3 v0.30.0 - github.com/aws/aws-sdk-go-v2 v0.30.0 - github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v0.3.1 - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v0.1.2 - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v0.3.2 - github.com/aws/aws-sdk-go-v2/service/sts v0.30.0 - github.com/aws/aws-sdk-go-v2/credentials v0.1.5 - github.com/aws/aws-sdk-go-v2/ec2imds v0.1.5 ) replace ( diff --git a/service/s3control/api_client.go b/service/s3control/api_client.go index 4a43d826c83..661cf75b7e3 100644 --- a/service/s3control/api_client.go +++ b/service/s3control/api_client.go @@ -197,11 +197,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -209,9 +214,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/s3outposts/api_client.go b/service/s3outposts/api_client.go index e0304f97aea..ab691be2178 100644 --- a/service/s3outposts/api_client.go +++ b/service/s3outposts/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/sagemaker/api_client.go b/service/sagemaker/api_client.go index 27f0d4d4226..0de892770ce 100644 --- a/service/sagemaker/api_client.go +++ b/service/sagemaker/api_client.go @@ -191,11 +191,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -203,9 +208,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/sagemakera2iruntime/api_client.go b/service/sagemakera2iruntime/api_client.go index 67df5da88d4..4b26c4062c9 100644 --- a/service/sagemakera2iruntime/api_client.go +++ b/service/sagemakera2iruntime/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/sagemakerruntime/api_client.go b/service/sagemakerruntime/api_client.go index 704f9aa5bc4..c494ade7c6c 100644 --- a/service/sagemakerruntime/api_client.go +++ b/service/sagemakerruntime/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/savingsplans/api_client.go b/service/savingsplans/api_client.go index 73b5f92602c..c3516b3a501 100644 --- a/service/savingsplans/api_client.go +++ b/service/savingsplans/api_client.go @@ -190,11 +190,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -202,9 +207,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/schemas/api_client.go b/service/schemas/api_client.go index 7ff9aae07ee..65b560620d2 100644 --- a/service/schemas/api_client.go +++ b/service/schemas/api_client.go @@ -190,11 +190,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -202,9 +207,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/secretsmanager/api_client.go b/service/secretsmanager/api_client.go index 55b54a29836..cbe5164b3d5 100644 --- a/service/secretsmanager/api_client.go +++ b/service/secretsmanager/api_client.go @@ -190,11 +190,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -202,9 +207,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/securityhub/api_client.go b/service/securityhub/api_client.go index 436a43a33df..0cb06205a38 100644 --- a/service/securityhub/api_client.go +++ b/service/securityhub/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/serverlessapplicationrepository/api_client.go b/service/serverlessapplicationrepository/api_client.go index 7c84228900d..19ee8b0de90 100644 --- a/service/serverlessapplicationrepository/api_client.go +++ b/service/serverlessapplicationrepository/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/servicecatalog/api_client.go b/service/servicecatalog/api_client.go index 15d38a7960c..27a800174ac 100644 --- a/service/servicecatalog/api_client.go +++ b/service/servicecatalog/api_client.go @@ -190,11 +190,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -202,9 +207,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/servicecatalogappregistry/api_client.go b/service/servicecatalogappregistry/api_client.go index 83cbabb9b47..ebf76f7a99c 100644 --- a/service/servicecatalogappregistry/api_client.go +++ b/service/servicecatalogappregistry/api_client.go @@ -191,11 +191,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -203,9 +208,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/servicediscovery/api_client.go b/service/servicediscovery/api_client.go index 979c3a04471..b34705616cc 100644 --- a/service/servicediscovery/api_client.go +++ b/service/servicediscovery/api_client.go @@ -190,11 +190,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -202,9 +207,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/servicequotas/api_client.go b/service/servicequotas/api_client.go index 196e36b802b..7b8c90fd37a 100644 --- a/service/servicequotas/api_client.go +++ b/service/servicequotas/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/ses/api_client.go b/service/ses/api_client.go index 7a886a90ba8..e375c49a051 100644 --- a/service/ses/api_client.go +++ b/service/ses/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/sesv2/api_client.go b/service/sesv2/api_client.go index 94a7cc31ee7..d64f7e3bf92 100644 --- a/service/sesv2/api_client.go +++ b/service/sesv2/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/sfn/api_client.go b/service/sfn/api_client.go index 43d85800df6..a510ea2745d 100644 --- a/service/sfn/api_client.go +++ b/service/sfn/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/shield/api_client.go b/service/shield/api_client.go index f23711ef568..34a27d9a9b8 100644 --- a/service/shield/api_client.go +++ b/service/shield/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/signer/api_client.go b/service/signer/api_client.go index ff77e0708d2..d5f339fe30c 100644 --- a/service/signer/api_client.go +++ b/service/signer/api_client.go @@ -190,11 +190,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -202,9 +207,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/sms/api_client.go b/service/sms/api_client.go index 840209fee0d..8a08538dd4e 100644 --- a/service/sms/api_client.go +++ b/service/sms/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/snowball/api_client.go b/service/snowball/api_client.go index b4f063d1af4..97100d2bcb0 100644 --- a/service/snowball/api_client.go +++ b/service/snowball/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/sns/api_client.go b/service/sns/api_client.go index d0667bc5aa2..460dba921cd 100644 --- a/service/sns/api_client.go +++ b/service/sns/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/sqs/api_client.go b/service/sqs/api_client.go index 7e98b8ae400..815ee996e01 100644 --- a/service/sqs/api_client.go +++ b/service/sqs/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/ssm/api_client.go b/service/ssm/api_client.go index 28c1bbdeca2..647c3b1c87d 100644 --- a/service/ssm/api_client.go +++ b/service/ssm/api_client.go @@ -191,11 +191,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -203,9 +208,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/sso/api_client.go b/service/sso/api_client.go index bda86f4ffd7..1fa847ed626 100644 --- a/service/sso/api_client.go +++ b/service/sso/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/ssoadmin/api_client.go b/service/ssoadmin/api_client.go index c53be3dcd0a..b1b7889c535 100644 --- a/service/ssoadmin/api_client.go +++ b/service/ssoadmin/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/ssooidc/api_client.go b/service/ssooidc/api_client.go index 73f8a9086ad..5882309ca5c 100644 --- a/service/ssooidc/api_client.go +++ b/service/ssooidc/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/storagegateway/api_client.go b/service/storagegateway/api_client.go index cd45956b732..28bab066566 100644 --- a/service/storagegateway/api_client.go +++ b/service/storagegateway/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/sts/api_client.go b/service/sts/api_client.go index 239afc6ca95..00049bf74c5 100644 --- a/service/sts/api_client.go +++ b/service/sts/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/support/api_client.go b/service/support/api_client.go index b7bb18691f9..77e3463b463 100644 --- a/service/support/api_client.go +++ b/service/support/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/swf/api_client.go b/service/swf/api_client.go index 7774641bc3a..fc82e8a3652 100644 --- a/service/swf/api_client.go +++ b/service/swf/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/synthetics/api_client.go b/service/synthetics/api_client.go index 0ddb7771fd0..73d464c0d07 100644 --- a/service/synthetics/api_client.go +++ b/service/synthetics/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/textract/api_client.go b/service/textract/api_client.go index aebfd9fd4df..519c9abad7c 100644 --- a/service/textract/api_client.go +++ b/service/textract/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/timestreamquery/api_client.go b/service/timestreamquery/api_client.go index 1fa43dc9d74..d307d0c2e95 100644 --- a/service/timestreamquery/api_client.go +++ b/service/timestreamquery/api_client.go @@ -191,11 +191,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -203,9 +208,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/timestreamwrite/api_client.go b/service/timestreamwrite/api_client.go index 0e2c40e529c..fb294506441 100644 --- a/service/timestreamwrite/api_client.go +++ b/service/timestreamwrite/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/transcribe/api_client.go b/service/transcribe/api_client.go index 4db078ae713..ef5cd5b0dd6 100644 --- a/service/transcribe/api_client.go +++ b/service/transcribe/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/transfer/api_client.go b/service/transfer/api_client.go index fd262fe5404..25bf0492eb7 100644 --- a/service/transfer/api_client.go +++ b/service/transfer/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/translate/api_client.go b/service/translate/api_client.go index 2414e81cbb7..59f8d369856 100644 --- a/service/translate/api_client.go +++ b/service/translate/api_client.go @@ -190,11 +190,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -202,9 +207,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/waf/api_client.go b/service/waf/api_client.go index bfdae89b8a7..5781794e565 100644 --- a/service/waf/api_client.go +++ b/service/waf/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/wafregional/api_client.go b/service/wafregional/api_client.go index 940fb1ba283..48b7d0a71e8 100644 --- a/service/wafregional/api_client.go +++ b/service/wafregional/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/wafv2/api_client.go b/service/wafv2/api_client.go index d4882a716e8..00e7e904d80 100644 --- a/service/wafv2/api_client.go +++ b/service/wafv2/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/workdocs/api_client.go b/service/workdocs/api_client.go index c46cfabafca..337ebeae0a6 100644 --- a/service/workdocs/api_client.go +++ b/service/workdocs/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/worklink/api_client.go b/service/worklink/api_client.go index 6517f333809..b21650f2b81 100644 --- a/service/worklink/api_client.go +++ b/service/worklink/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/workmail/api_client.go b/service/workmail/api_client.go index d2eac243e1a..d5866b2cb90 100644 --- a/service/workmail/api_client.go +++ b/service/workmail/api_client.go @@ -190,11 +190,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -202,9 +207,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/workmailmessageflow/api_client.go b/service/workmailmessageflow/api_client.go index 3d4e1209d9d..0bb093681b8 100644 --- a/service/workmailmessageflow/api_client.go +++ b/service/workmailmessageflow/api_client.go @@ -183,11 +183,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -195,9 +200,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/workspaces/api_client.go b/service/workspaces/api_client.go index 3a8c4a6c423..41beef9ba11 100644 --- a/service/workspaces/api_client.go +++ b/service/workspaces/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } diff --git a/service/xray/api_client.go b/service/xray/api_client.go index a13ea4faf52..2ac225dc8e2 100644 --- a/service/xray/api_client.go +++ b/service/xray/api_client.go @@ -182,11 +182,16 @@ func addClientUserAgent(stack *middleware.Stack) error { } func addHTTPSignerV4Middleware(stack *middleware.Stack, o Options) error { - return stack.Finalize.Add(v4.NewSignHTTPRequestMiddleware(o.Credentials, o.HTTPSignerV4), middleware.After) + mw := v4.NewSignHTTPRequestMiddleware(v4.SignHTTPRequestMiddlewareOptions{ + CredentialsProvider: o.Credentials, + Signer: o.HTTPSignerV4, + LogSigning: o.ClientLogMode.IsSigning(), + }) + return stack.Finalize.Add(mw, middleware.After) } type HTTPSignerV4 interface { - SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error + SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error } func resolveHTTPSignerV4(o *Options) { @@ -194,9 +199,9 @@ func resolveHTTPSignerV4(o *Options) { return } o.HTTPSignerV4 = v4.NewSigner( - func(s *v4.Signer) { - s.Logger = o.Logger - s.LogSigning = o.ClientLogMode.IsSigning() + func(so *v4.SignerOptions) { + so.Logger = o.Logger + so.LogSigning = o.ClientLogMode.IsSigning() }, ) } From e8c30e3a8bae7a7e584ce63baa9b1a3e892da080 Mon Sep 17 00:00:00 2001 From: Sean McGrail Date: Wed, 9 Dec 2020 14:44:51 -0800 Subject: [PATCH 4/4] Implement Feedback --- aws/signer/v4/middleware.go | 26 +++++++++++++----------- aws/signer/v4/middleware_test.go | 4 ++-- aws/signer/v4/presign_middleware.go | 24 ++++++++++++---------- aws/signer/v4/presign_middleware_test.go | 4 ++-- 4 files changed, 31 insertions(+), 27 deletions(-) diff --git a/aws/signer/v4/middleware.go b/aws/signer/v4/middleware.go index a9b9f1eebfc..d9de189150c 100644 --- a/aws/signer/v4/middleware.go +++ b/aws/signer/v4/middleware.go @@ -195,36 +195,36 @@ func (m *contentSHA256Header) HandleBuild( return next.HandleBuild(ctx, in) } -// SignHTTPRequestMiddlewareOptions is the configuration options for the SignHTTPRequest middleware. +// SignHTTPRequestMiddlewareOptions is the configuration options for the SignHTTPRequestMiddleware middleware. type SignHTTPRequestMiddlewareOptions struct { CredentialsProvider aws.CredentialsProvider Signer HTTPSigner LogSigning bool } -// SignHTTPRequest is a `FinalizeMiddleware` implementation for SigV4 HTTP Signing -type SignHTTPRequest struct { +// SignHTTPRequestMiddleware is a `FinalizeMiddleware` implementation for SigV4 HTTP Signing +type SignHTTPRequestMiddleware struct { credentialsProvider aws.CredentialsProvider signer HTTPSigner logSigning bool } -// NewSignHTTPRequestMiddleware constructs a SignHTTPRequest using the given Signer for signing requests -func NewSignHTTPRequestMiddleware(options SignHTTPRequestMiddlewareOptions) *SignHTTPRequest { - return &SignHTTPRequest{ +// NewSignHTTPRequestMiddleware constructs a SignHTTPRequestMiddleware using the given Signer for signing requests +func NewSignHTTPRequestMiddleware(options SignHTTPRequestMiddlewareOptions) *SignHTTPRequestMiddleware { + return &SignHTTPRequestMiddleware{ credentialsProvider: options.CredentialsProvider, signer: options.Signer, logSigning: options.LogSigning, } } -// ID is the SignHTTPRequest identifier -func (s *SignHTTPRequest) ID() string { +// ID is the SignHTTPRequestMiddleware identifier +func (s *SignHTTPRequestMiddleware) ID() string { return "Signing" } // HandleFinalize will take the provided input and sign the request using the SigV4 authentication scheme -func (s *SignHTTPRequest) HandleFinalize(ctx context.Context, in middleware.FinalizeInput, next middleware.FinalizeHandler) ( +func (s *SignHTTPRequestMiddleware) HandleFinalize(ctx context.Context, in middleware.FinalizeInput, next middleware.FinalizeHandler) ( out middleware.FinalizeOutput, metadata middleware.Metadata, err error, ) { if !haveCredentialProvider(s.credentialsProvider) { @@ -247,9 +247,7 @@ func (s *SignHTTPRequest) HandleFinalize(ctx context.Context, in middleware.Fina return out, metadata, &SigningError{Err: fmt.Errorf("failed to retrieve credentials: %w", err)} } - err = s.signer.SignHTTP(ctx, credentials, req.Request, payloadHash, signingName, signingRegion, sdk.NowTime(), func(options *SignerOptions) { - options.LogSigning = s.logSigning - }) + err = s.signer.SignHTTP(ctx, credentials, req.Request, payloadHash, signingName, signingRegion, sdk.NowTime(), s.addSignerOptions) if err != nil { return out, metadata, &SigningError{Err: fmt.Errorf("failed to sign http request, %w", err)} } @@ -257,6 +255,10 @@ func (s *SignHTTPRequest) HandleFinalize(ctx context.Context, in middleware.Fina return next.HandleFinalize(ctx, in) } +func (s *SignHTTPRequestMiddleware) addSignerOptions(options *SignerOptions) { + options.LogSigning = s.logSigning +} + func haveCredentialProvider(p aws.CredentialsProvider) bool { if p == nil { return false diff --git a/aws/signer/v4/middleware_test.go b/aws/signer/v4/middleware_test.go index 9604adcb198..3942b7bfd72 100644 --- a/aws/signer/v4/middleware_test.go +++ b/aws/signer/v4/middleware_test.go @@ -117,7 +117,7 @@ func TestSignHTTPRequestMiddleware(t *testing.T) { for name, tt := range cases { t.Run(name, func(t *testing.T) { - c := &SignHTTPRequest{ + c := &SignHTTPRequestMiddleware{ credentialsProvider: tt.creds, signer: httpSignerFunc( func(ctx context.Context, @@ -196,5 +196,5 @@ var ( _ middleware.BuildMiddleware = &unsignedPayload{} _ middleware.BuildMiddleware = &computePayloadSHA256{} _ middleware.BuildMiddleware = &contentSHA256Header{} - _ middleware.FinalizeMiddleware = &SignHTTPRequest{} + _ middleware.FinalizeMiddleware = &SignHTTPRequestMiddleware{} ) diff --git a/aws/signer/v4/presign_middleware.go b/aws/signer/v4/presign_middleware.go index 2545957a180..c8bf5c62e25 100644 --- a/aws/signer/v4/presign_middleware.go +++ b/aws/signer/v4/presign_middleware.go @@ -31,28 +31,28 @@ type PresignedHTTPRequest struct { SignedHeader http.Header } -// PresignHTTPRequestMiddlewareOptions is the options for the PresignHTTPRequest middleware. +// PresignHTTPRequestMiddlewareOptions is the options for the PresignHTTPRequestMiddleware middleware. type PresignHTTPRequestMiddlewareOptions struct { CredentialsProvider aws.CredentialsProvider Presigner HTTPPresigner LogSigning bool } -// PresignHTTPRequest provides the Finalize middleware for creating a +// PresignHTTPRequestMiddleware provides the Finalize middleware for creating a // presigned URL for an HTTP request. // // Will short circuit the middleware stack and not forward onto the next // Finalize handler. -type PresignHTTPRequest struct { +type PresignHTTPRequestMiddleware struct { credentialsProvider aws.CredentialsProvider presigner HTTPPresigner logSigning bool } -// NewPresignHTTPRequestMiddleware returns a new PresignHTTPRequest +// NewPresignHTTPRequestMiddleware returns a new PresignHTTPRequestMiddleware // initialized with the presigner. -func NewPresignHTTPRequestMiddleware(options PresignHTTPRequestMiddlewareOptions) *PresignHTTPRequest { - return &PresignHTTPRequest{ +func NewPresignHTTPRequestMiddleware(options PresignHTTPRequestMiddlewareOptions) *PresignHTTPRequestMiddleware { + return &PresignHTTPRequestMiddleware{ credentialsProvider: options.CredentialsProvider, presigner: options.Presigner, logSigning: options.LogSigning, @@ -60,13 +60,13 @@ func NewPresignHTTPRequestMiddleware(options PresignHTTPRequestMiddlewareOptions } // ID provides the middleware ID. -func (*PresignHTTPRequest) ID() string { return "PresignHTTPRequest" } +func (*PresignHTTPRequestMiddleware) ID() string { return "PresignHTTPRequest" } // HandleFinalize will take the provided input and create a presigned url for // the http request using the SigV4 presign authentication scheme. // // Since the signed request is not a valid HTTP request -func (s *PresignHTTPRequest) HandleFinalize( +func (s *PresignHTTPRequestMiddleware) HandleFinalize( ctx context.Context, in middleware.FinalizeInput, next middleware.FinalizeHandler, ) ( out middleware.FinalizeOutput, metadata middleware.Metadata, err error, @@ -106,9 +106,7 @@ func (s *PresignHTTPRequest) HandleFinalize( } u, h, err := s.presigner.PresignHTTP(ctx, credentials, - httpReq, payloadHash, signingName, signingRegion, sdk.NowTime(), func(options *SignerOptions) { - options.LogSigning = s.logSigning - }) + httpReq, payloadHash, signingName, signingRegion, sdk.NowTime(), s.addSignerOptions) if err != nil { return out, metadata, &SigningError{ Err: fmt.Errorf("failed to sign http request, %w", err), @@ -123,3 +121,7 @@ func (s *PresignHTTPRequest) HandleFinalize( return out, metadata, nil } + +func (s *PresignHTTPRequestMiddleware) addSignerOptions(options *SignerOptions) { + options.LogSigning = s.logSigning +} diff --git a/aws/signer/v4/presign_middleware_test.go b/aws/signer/v4/presign_middleware_test.go index 98747465ef0..76ee52d4268 100644 --- a/aws/signer/v4/presign_middleware_test.go +++ b/aws/signer/v4/presign_middleware_test.go @@ -105,7 +105,7 @@ func TestPresignHTTPRequestMiddleware(t *testing.T) { for name, c := range cases { t.Run(name, func(t *testing.T) { - m := &PresignHTTPRequest{ + m := &PresignHTTPRequestMiddleware{ credentialsProvider: c.Creds, presigner: httpPresignerFunc(func( @@ -178,5 +178,5 @@ func TestPresignHTTPRequestMiddleware(t *testing.T) { } var ( - _ middleware.FinalizeMiddleware = &PresignHTTPRequest{} + _ middleware.FinalizeMiddleware = &PresignHTTPRequestMiddleware{} )